Merge pull request #289 from boriel/bugfix/const_crash

Fix a crash in some const cases

Author: boriel

api/optimize.py

@@ -12,6 +12,7 @@
 import types
 from api.debug import __DEBUG__
 from api.errmsg import warning_not_used
+import api.utils
 
 
 class ToVisit(object):
@@ -110,7 +111,8 @@ def visit_CHR(self, node):
         node = (yield self.generic_visit(node))
 
         if all(chk.is_static(arg.value) for arg in node.operand):
-            yield symbols.STRING(''.join(chr(x.value.value & 0xFF) for x in node.operand), node.lineno)
+            yield symbols.STRING(''.join(
+                chr(api.utils.get_final_value(x.value) & 0xFF) for x in node.operand), node.lineno)
         else:
             yield node
 

api/utils.py

@@ -7,6 +7,9 @@
 from . import constants
 from . import global_
 from . import errmsg
+from . import check
+
+import symbols
 
 
 __all__ = ['read_txt_file', 'open_file', 'sanitize_filename', 'flatten_list']
@@ -118,3 +121,12 @@ def save_object(key, obj):
 
 def get_or_create(key, fn):
     return load_object(key) or save_object(key, fn())
+
+
+def get_final_value(symbol: symbols.SYMBOL):
+    assert check.is_static(symbol)
+    result = symbol
+    while hasattr(result, 'value'):
+        result = result.value
+
+    return result

symbols/__init__.py

@@ -10,6 +10,7 @@
 # ----------------------------------------------------------------------
 
 # ---- AST Symbols ----
+from .symbol_ import Symbol as SYMBOL
 from .arglist import SymbolARGLIST as ARGLIST
 from .argument import SymbolARGUMENT as ARGUMENT
 from .arrayaccess import SymbolARRAYACCESS as ARRAYACCESS
@@ -51,6 +52,7 @@
     'ARRAYDECL',
     'ARRAYLOAD',
     'ASM',
+    'BASICTYPE',
     'BINARY',
     'BLOCK',
     'BOUND',
@@ -61,20 +63,20 @@
     'FUNCCALL',
     'FUNCDECL',
     'FUNCTION',
+    'LABEL',
     'NOP',
     'NUMBER',
     'PARAMDECL',
     'PARAMLIST',
     'SENTENCE',
     'STRING',
     'STRSLICE',
-    'BASICTYPE',
+    'SYMBOL',
     'TYPE',
     'TYPEREF',
     'TYPECAST',
     'UNARY',
     'VAR',
     'VARARRAY',
     'VARDECL',
-    'LABEL',
 ]