berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

scripting engine: bugfix with struct scope

This commit is contained in:
nakst 2022-02-13 08:24:09 +00:00
parent f6a54e1093
commit 55e6865d98
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/script.c
View File

@ -1,5 +1,3 @@
// TODO Bug: Structure fields cannot have names the same as global variables or as in other structures.
// TODO Basic missing features:
// - Other list operations: insert_many, delete_many.
// - Maps: map[int, T], map[str, T].
@ -2212,8 +2210,8 @@ bool ASTSetScopes(Tokenizer *tokenizer, ExecutionContext *context, Node *node, S
}
}
if (node->type == T_DECLARE || node->type == T_FUNCTION || node->type == T_FUNCTYPE
|| node->type == T_STRUCT || node->type == T_IMPORT) {
if ((node->type == T_DECLARE || node->type == T_FUNCTION || node->type == T_FUNCTYPE
|| node->type == T_STRUCT || node->type == T_IMPORT) && node->parent->type != T_STRUCT) {
if (!ScopeAddEntry(tokenizer, scope, node)) {
return false;
}