mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-18 08:58:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow $ in polymorphic record parameter fields (but disallow mixing)

Browse Source
This commit is contained in:
gingerBill
2021-03-23 22:59:10 +00:00
parent c62980eaea
commit 08f7d3edbe
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/parser.cpp
View File

@@ -490,6 +490,13 @@ bool ast_node_expect(Ast *node, AstKind kind) {
}
return true;
}
bool ast_node_expect2(Ast *node, AstKind kind0, AstKind kind1) {
if (node->kind != kind0 && node->kind != kind1) {
syntax_error(node, "Expected %.*s or %.*s, got %.*s", LIT(ast_strings[kind0]), LIT(ast_strings[kind1]), LIT(ast_strings[node->kind]));
return false;
}
return true;
}
Ast *ast_bad_expr(AstFile *f, Token begin, Token end) {
Ast *result = alloc_ast_node(f, Ast_BadExpr);
@@ -1863,9 +1870,9 @@ void check_polymorphic_params_for_type(AstFile *f, Ast *polymorphic_params, Toke
}
for_array(i, field->Field.names) {
Ast *name = field->Field.names[i];
if (name->kind == Ast_PolyType) {
syntax_error(name, "Polymorphic names are not needed for %.*s parameters", LIT(token.string));
return; // TODO(bill): Err multiple times or just the once?
if (name->kind != field->Field.names[0]->kind) {
syntax_error(name, "Mixture of polymorphic names using both $ and not for %.*s parameters", LIT(token.string));
return;
}
}
}