From: Wolfgang Bumiller <blub@speed.at>
Date: Wed, 6 Feb 2013 09:55:06 +0000 (+0100)
Subject: find aliases in parser_find_global instead of parser_sya_operand
X-Git-Tag: before-library~140
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9bc774dcd33ba137f73840f59e25bec658706eaf;p=xonotic%2Fgmqcc.git

find aliases in parser_find_global instead of parser_sya_operand
---

diff --git a/parser.c b/parser.c
index a061d7a..bc49073 100644
--- 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) {