From 55e6865d98823b57a947add586d73578b37e09ee Mon Sep 17 00:00:00 2001
From: nakst <>
Date: Sun, 13 Feb 2022 08:24:09 +0000
Subject: [PATCH] scripting engine: bugfix with struct scope

---
 util/script.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/util/script.c b/util/script.c
index 12fa8ea..2955205 100644
--- a/util/script.c
+++ b/util/script.c
@@ -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;
 		}