fix custom operators not working with namespaces

Spydr06 · Oct 17, 2024 · 9b3ad71 · 9b3ad71
1 parent f7e1494
commit 9b3ad71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/compiler/parser/parser.c b/src/compiler/parser/parser.c
@@ -2337,6 +2337,7 @@ static ASTNode_T* parse_custom_prefix_operator(Parser_T* p)
     ASTNode_T* call = init_ast_node(&p->context->raw_allocator, ND_CALL, p->tok);
     call->expr = init_ast_node(&p->context->raw_allocator, ND_ID, p->tok);
     call->expr->id = init_ast_identifier(&p->context->raw_allocator, p->tok, p->tok->value);
+    call->expr->id->global_scope = false;
 
     parser_consume(p, TOKEN_OPERATOR, "expect operator");
 

diff --git a/src/compiler/parser/validator.c b/src/compiler/parser/validator.c
@@ -331,11 +331,13 @@ static ASTObj_T* scope_contains(Scope_T* scope, const char* id)
 
 static IdentResolveResult_T scope_resolve_ident(Validator_T* v, Scope_T* scope, ASTIdentifier_T* ident)
 {
-    if(ident->global_scope)
-        scope = v->global_scope;
+
     if(!scope || !ident)
         return IDENT_MISSING(ident);
 
+    if(ident->global_scope)
+        scope = v->global_scope;
+
     if(ident->outer)
     {
         IdentResolveResult_T outer_result = scope_resolve_ident(v, scope, ident->outer);