Merge pull request #383 from boriel/bugfix/dim_arr_at_wrong

Fix bug in dim array AT

Author: boriel

arch/zx48k/translator.py

@@ -1118,7 +1118,8 @@ def visit_ARRAYDECL(self, node):
         arr_data = []
 
         if entry.addr:
-            self.ic_deflabel(data_label, "%s" % entry.addr)
+            addr = self.traverse_const(entry.addr) if isinstance(entry.addr, symbols.SYMBOL) else entry.addr
+            self.ic_deflabel(data_label, "%s" % addr)
         else:
             if entry.default_value is not None:
                 arr_data = Translator.array_default_value(node.type_, entry.default_value)

tests/functional/dim_arr_at_label0.asm

@@ -28,7 +28,7 @@ __END_PROGRAM:
 __CALL_BACK__:
 	DEFW 0
 ZXBASIC_USER_DATA:
-	_a.__DATA__ EQU ADDRESS(c)
+	_a.__DATA__ EQU __LABEL__c
 _a:
 	DEFW __LABEL0
 _a.__DATA__.__PTR__:

tests/functional/dim_arr_at_label1.asm

@@ -28,7 +28,7 @@ __END_PROGRAM:
 __CALL_BACK__:
 	DEFW 0
 ZXBASIC_USER_DATA:
-	_a.__DATA__ EQU ADDRESS(c) PLUS 1
+	_a.__DATA__ EQU (__LABEL__c) + (1)
 _a:
 	DEFW __LABEL0
 _a.__DATA__.__PTR__: