From 9bc774dcd33ba137f73840f59e25bec658706eaf Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Wed, 6 Feb 2013 10:55:06 +0100 Subject: [PATCH] find aliases in parser_find_global instead of parser_sya_operand --- parser.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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) { -- 2.39.2