Ensure alias and import can be mixed

v0/parser.c

@@ -39,10 +39,7 @@ Module* parser_parse(TokenStream* ts) {
 
 	while (1) {
 		t = tokenstream_next(ts);
-		if (t.token != TOKEN_IMPORT) {
-			break;
-		}
-
+		if (t.token == TOKEN_IMPORT) {
             ImportDeclaration* new_imports = realloc(module->imports, (module->import_count + 1) * sizeof(ImportDeclaration));
             if (!new_imports) {
                 fprintf(stderr, "Out of memory\n");
@@ -76,9 +73,7 @@ Module* parser_parse(TokenStream* ts) {
                 parser_free(module);
                 return NULL;
             }
-	}
-
-    while (t.token == TOKEN_ALIAS) {
+        } else if (t.token == TOKEN_ALIAS) {
             AliasDeclaration* new_aliases = realloc(module->aliases, (module->alias_count + 1) * sizeof(AliasDeclaration));
             if (!new_aliases) {
                 fprintf(stderr, "Out of memory\n");
@@ -139,7 +134,9 @@ Module* parser_parse(TokenStream* ts) {
                 parser_free(module);
                 return NULL;
             }
-        t = tokenstream_next(ts);
+        } else {
+            break;
+        }
 	}
 
 	return module;

v0/test.c

@@ -199,6 +199,7 @@ static TestCase s_tests[] = {
     {"log_error", test_log_error},
     {"log_on_line", test_log_on_line},
     {"log_on_line_variadic", test_log_on_line_variadic},
+    {"parser_alias_and_import_mix", test_parser_alias_and_import_mix},
 };
 
 

v0/test_parser.c

@@ -110,3 +110,17 @@ static void test_parser_alias_array(void) {
 	assert_true(valueType->builtin.isSigned, "expected signed");
 }
 
+
+static void test_parser_alias_and_import_mix(void) {
+	Module* m = test_get_ast();
+    
+	assert_not_null(m, "expected module to be parsed");
+    assert_int(2, (int)m->import_count, "expected 2 imports");
+    assert_int(2, (int)m->alias_count, "expected 2 aliases");
+    
+    assert_str("foo", m->imports[0].module_name, "expected import 1 name 'foo'");
+    assert_str("bar", m->imports[1].module_name, "expected import 2 name 'bar'");
+    assert_str("myalias", m->aliases[0].name, "expected alias 1 name 'myalias'");
+    assert_str("otheralias", m->aliases[1].name, "expected alias 2 name 'otheralias'");
+    parser_free(m);
+}

v0/tests/parser_alias_and_import_mix.c2

@@ -0,0 +1,9 @@
+module mymodule;
+
+import foo;
+
+alias myalias = int32[];
+
+import bar;
+
+alias otheralias = int32;