find aliases in parser_find_global instead of parser_sya_operand

diff --git a/parser.c b/parser.c
index a061d7a0f1f1afe28ae31a9c66690e8f75274f7d..bc490733b2d27f3cd3239c04546fcaf5b1accd71 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -319,6 +319,9 @@ static ast_expression* parser_find_label(parser_t *parser, const char *name)
 
 static ast_expression* parser_find_global(parser_t *parser, const char *name)
 {
+    ast_expression *var = (ast_expression*)util_htget(parser->aliases, parser_tokval(parser));
+    if (var)
+        return var;
     return (ast_expression*)util_htget(parser->htglobals, name);
 }
 
@@ -1826,8 +1829,6 @@ static bool parse_sya_operand(parser_t *parser, shunt *sy, bool with_labels)
             /* intrinsics */
             if (!strcmp(parser_tokval(parser), "__builtin_debug_typestring")) {
                 var = (ast_expression*)intrinsic_debug_typestring;
-            } else {
-                var = (ast_expression*)util_htget(parser->aliases, parser_tokval(parser));
             }
                 
             if (!var) {