From 13e11b2fafe60cad7d04d80c602adc12d6080036 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@gmail.com>
Date: Fri, 22 Apr 2011 18:24:59 -0400
Subject: Handle symbol aliases in dmnsn_find_symbol() directly.

Fixes infinite loops when macro arguments have the same name as existing
symbols.
---
 dimension/parse.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'dimension/parse.c')

diff --git a/dimension/parse.c b/dimension/parse.c
index 74075a7..6651d41 100644
--- a/dimension/parse.c
+++ b/dimension/parse.c
@@ -131,8 +131,13 @@ dmnsn_find_symbol(dmnsn_symbol_table *symtable, const char *id)
 
   DMNSN_ARRAY_FOREACH_REVERSE (dmnsn_dictionary **, dict, symtable) {
     symbol = dmnsn_dictionary_at(*dict, id);
-    if (symbol)
-      break;
+    if (symbol) {
+      if (symbol->type == DMNSN_AST_IDENTIFIER) {
+        id = symbol->ptr;
+      } else {
+        break;
+      }
+    }
   }
 
   return symbol;
-- 
cgit v1.2.3