ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-06-16 02:42:22 -07: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
src/check_type.cpp
+12 -4
View File
@@ -152,10 +152,12 @@ void check_struct_fields(CheckerContext *ctx, Ast *node, Array<Entity *> *fields
for_array(j, p->names) {
Ast *name = p->names[j];
if (!ast_node_expect(name, Ast_Ident)) {
if (!ast_node_expect2(name, Ast_Ident, Ast_PolyType)) {
continue;
}
if (name->kind == Ast_PolyType) {
name = name->PolyType.type;
}
Token name_token = name->Ident.token;
Entity *field = alloc_entity_field(ctx->scope, name_token, type, is_using, field_src_index);
@@ -464,9 +466,12 @@ void check_struct_type(CheckerContext *ctx, Type *struct_type, Ast *node, Array<
Scope *scope = ctx->scope;
for_array(j, p->names) {
Ast *name = p->names[j];
if (!ast_node_expect(name, Ast_Ident)) {
if (!ast_node_expect2(name, Ast_Ident, Ast_PolyType)) {
continue;
}
if (name->kind == Ast_PolyType) {
name = name->PolyType.type;
}
Entity *e = nullptr;
Token token = name->Ident.token;
@@ -680,9 +685,12 @@ void check_union_type(CheckerContext *ctx, Type *union_type, Ast *node, Array<Op
Scope *scope = ctx->scope;
for_array(j, p->names) {
Ast *name = p->names[j];
if (!ast_node_expect(name, Ast_Ident)) {
if (!ast_node_expect2(name, Ast_Ident, Ast_PolyType)) {
continue;
}
if (name->kind == Ast_PolyType) {
name = name->PolyType.type;
}
Entity *e = nullptr;
Token token = name->Ident.token;