Added some more tests

Author: cmbasnett

tests/parser/types.rs tests/parser/array_type.rstests/parser/types.rs renamed to tests/parser/array_type.rs

@@ -23,7 +23,7 @@ fn array_type_empty_fails() {
 }
 
 #[test]
-fn nested_array_types() {
+fn array_type_nested() {
     parses_to! {
         parser: UnrealScriptParser,
         input: "array<array<int>>",
@@ -34,26 +34,4 @@ fn nested_array_types() {
             ])])
         ]
     }
-}
-
-#[test]
-fn class_type() {
-    parses_to!(
-        parser: UnrealScriptParser,
-        input: "class<Foo.Bar>",
-        rule: Rule::class_type,
-        tokens: [ class_type(0, 14, [ identifier(6, 13) ]) ]
-    )
-}
-
-#[test]
-fn class_type_empty_fails() {
-    fails_with!(
-        parser: UnrealScriptParser,
-        input: "class<>",
-        rule: Rule::class_type,
-        positives: [Rule::identifier],
-        negatives: [],
-        pos: 6
-    )
-}
+}

tests/parser/class_type.rs

@@ -0,0 +1,23 @@
+use super::*;
+
+#[test]
+fn class_type() {
+    parses_to!(
+        parser: UnrealScriptParser,
+        input: "class<Foo.Bar>",
+        rule: Rule::class_type,
+        tokens: [ class_type(0, 14, [ identifier(6, 13) ]) ]
+    )
+}
+
+#[test]
+fn class_type_empty_fails() {
+    fails_with!(
+        parser: UnrealScriptParser,
+        input: "class<>",
+        rule: Rule::class_type,
+        positives: [Rule::identifier],
+        negatives: [],
+        pos: 6
+    )
+}

tests/parser/mod.rs

@@ -21,7 +21,8 @@ mod string_literal;
 mod vector_literal;
 
 // Type tests
-mod types;
+mod array_type;
+mod class_type;
 
 // Declaration tests
 mod class_declaration;

tests/parser/var_declaration.rs

@@ -143,3 +143,26 @@ fn var_declaration_all_features() {
         ]
     }
 }
+
+#[test]
+fn var_declaration_with_inline_struct_type() {
+    parses_to! {
+        parser: UnrealScriptParser,
+        input: "var struct Foo { var int Bar; } Baz;",
+        rule: Rule::var_declaration,
+        tokens: [
+            var_declaration(0, 36, [
+                type_(4, 31, [
+                    struct_declaration(4, 31, [
+                        unqualified_identifier(11, 14),
+                        struct_var_declaration(17, 29, [
+                            type_(21, 24, [ identifier(21, 24) ]),
+                            var_name(25, 28, [ unqualified_identifier(25, 28) ]),
+                        ])
+                    ])
+                ]),
+                var_name(32, 35, [ unqualified_identifier(32, 35) ]),
+            ])
+        ]
+    }
+}