seeseemelk/c2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure alias and import can be mixed

Browse Source
This commit is contained in:
Sebastiaan de Schaetzen
2026-04-29 11:46:02 +02:00
parent f90cad2b96
commit 84747028f5
4 changed files with 117 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v0/parser.c
+93 -96
View File
@@ -39,108 +39,105 @@ Module* parser_parse(TokenStream* ts) {
while (1) { while (1) {
t = tokenstream_next(ts); t = tokenstream_next(ts);
if (t.token != TOKEN_IMPORT) { if (t.token == TOKEN_IMPORT) {
break; ImportDeclaration* new_imports = realloc(module->imports, (module->import_count + 1) * sizeof(ImportDeclaration));
} if (!new_imports) {
fprintf(stderr, "Out of memory\n");
exit(1);
}
module->imports = new_imports;
ImportDeclaration* new_imports = realloc(module->imports, (module->import_count + 1) * sizeof(ImportDeclaration));
if (!new_imports) {
fprintf(stderr, "Out of memory\n");
exit(1);
}
module->imports = new_imports;
t = tokenstream_next(ts);
bool is_public = false;
if (t.token == TOKEN_PUBLIC) {
is_public = true;
t = tokenstream_next(ts); t = tokenstream_next(ts);
} bool is_public = false;
if (t.token == TOKEN_PUBLIC) {
if (t.token != TOKEN_IDENTIFIER) { is_public = true;
log_on_line(&t.location, t.location.column_end, "expected module name to import");
parser_free(module);
return NULL;
}
char* name = (char*)malloc(t.text.length + 1);
memcpy(name, t.text.data, t.text.length);
name[t.text.length] = '\0';
module->imports[module->import_count] = (ImportDeclaration){ .module_name = name, .is_public = is_public };
module->import_count++;
t = tokenstream_next(ts);
if (t.token != TOKEN_SEMICOLON) {
log_on_line(&t.location, t.location.column_end, "expected ';' after import");
parser_free(module);
return NULL;
}
}
while (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");
exit(1);
}
module->aliases = new_aliases;
t = tokenstream_next(ts);
if (t.token != TOKEN_IDENTIFIER) {
log_on_line(&t.location, t.location.column_end, "expected alias name");
parser_free(module);
return NULL;
}
char* name = (char*)malloc(t.text.length + 1);
memcpy(name, t.text.data, t.text.length);
name[t.text.length] = '\0';
AliasDeclaration alias;
alias.name = name;
t = tokenstream_next(ts);
if (t.token != TOKEN_ASSIGN) {
log_on_line(&t.location, t.location.column_end, "expected '='");
parser_free(module);
return NULL;
}
t = tokenstream_next(ts);
TypeExpression type;
if (t.token == TOKEN_IDENTIFIER && strncmp(t.text.data, "int32", t.text.length) == 0) {
type = (TypeExpression){ .tag = TYPE_EXPRESSION_BUILTIN, .builtin = { .bitSize = 32, .isSigned = true } };
t = tokenstream_next(ts);
if (t.token == TOKEN_BRACKET_OPEN) {
t = tokenstream_next(ts);
if (t.token != TOKEN_BRACKET_CLOSE) {
log_on_line(&t.location, t.location.column_end, "expected ']'");
parser_free(module);
return NULL;
}
TypeExpression* inner = malloc(sizeof(TypeExpression));
*inner = type;
type = (TypeExpression){ .tag = TYPE_EXPRESSION_ARRAY, .array = { .array = inner } };
t = tokenstream_next(ts); t = tokenstream_next(ts);
} }
if (t.token != TOKEN_IDENTIFIER) {
log_on_line(&t.location, t.location.column_end, "expected module name to import");
parser_free(module);
return NULL;
}
char* name = (char*)malloc(t.text.length + 1);
memcpy(name, t.text.data, t.text.length);
name[t.text.length] = '\0';
module->imports[module->import_count] = (ImportDeclaration){ .module_name = name, .is_public = is_public };
module->import_count++;
t = tokenstream_next(ts);
if (t.token != TOKEN_SEMICOLON) {
log_on_line(&t.location, t.location.column_end, "expected ';' after import");
parser_free(module);
return NULL;
}
} 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");
exit(1);
}
module->aliases = new_aliases;
t = tokenstream_next(ts);
if (t.token != TOKEN_IDENTIFIER) {
log_on_line(&t.location, t.location.column_end, "expected alias name");
parser_free(module);
return NULL;
}
char* name = (char*)malloc(t.text.length + 1);
memcpy(name, t.text.data, t.text.length);
name[t.text.length] = '\0';
AliasDeclaration alias;
alias.name = name;
t = tokenstream_next(ts);
if (t.token != TOKEN_ASSIGN) {
log_on_line(&t.location, t.location.column_end, "expected '='");
parser_free(module);
return NULL;
}
t = tokenstream_next(ts);
TypeExpression type;
if (t.token == TOKEN_IDENTIFIER && strncmp(t.text.data, "int32", t.text.length) == 0) {
type = (TypeExpression){ .tag = TYPE_EXPRESSION_BUILTIN, .builtin = { .bitSize = 32, .isSigned = true } };
t = tokenstream_next(ts);
if (t.token == TOKEN_BRACKET_OPEN) {
t = tokenstream_next(ts);
if (t.token != TOKEN_BRACKET_CLOSE) {
log_on_line(&t.location, t.location.column_end, "expected ']'");
parser_free(module);
return NULL;
}
TypeExpression* inner = malloc(sizeof(TypeExpression));
*inner = type;
type = (TypeExpression){ .tag = TYPE_EXPRESSION_ARRAY, .array = { .array = inner } };
t = tokenstream_next(ts);
}
} else {
log_on_line(&t.location, t.location.column_end, "expected type");
parser_free(module);
return NULL;
}
alias.value = type;
module->aliases[module->alias_count] = alias;
module->alias_count++;
if (t.token != TOKEN_SEMICOLON) {
log_on_line(&t.location, t.location.column_end, "expected ';'");
parser_free(module);
return NULL;
}
} else { } else {
log_on_line(&t.location, t.location.column_end, "expected type"); break;
parser_free(module);
return NULL;
} }
}
alias.value = type;
module->aliases[module->alias_count] = alias;
module->alias_count++;
if (t.token != TOKEN_SEMICOLON) {
log_on_line(&t.location, t.location.column_end, "expected ';'");
parser_free(module);
return NULL;
}
t = tokenstream_next(ts);
}
return module; return module;
} }
v0/test.c
+1
View File
@@ -199,6 +199,7 @@ static TestCase s_tests[] = {
{"log_error", test_log_error}, {"log_error", test_log_error},
{"log_on_line", test_log_on_line}, {"log_on_line", test_log_on_line},
{"log_on_line_variadic", test_log_on_line_variadic}, {"log_on_line_variadic", test_log_on_line_variadic},
{"parser_alias_and_import_mix", test_parser_alias_and_import_mix},
}; };
v0/test_parser.c
+14
View File
@@ -110,3 +110,17 @@ static void test_parser_alias_array(void) {
assert_true(valueType->builtin.isSigned, "expected signed"); 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
+9
View File
@@ -0,0 +1,9 @@
module mymodule;
import foo;
alias myalias = int32[];
import bar;
alias otheralias = int32;