Merge pull request #607 from boriel/fix/on_goto

fix: fix on goto/gosub jump table generation

Author: boriel

src/arch/z80/translator.py

@@ -25,14 +25,13 @@
 from src.arch.z80 import backend
 from src.arch.z80.backend.runtime import Labels as RuntimeLabel
 from src.arch.z80.backend._float import _float
-from src.arch.z80.translatorvisitor import TranslatorVisitor
+from src.arch.z80.translatorvisitor import TranslatorVisitor, JumpTable
 
 from src import symbols
 from src.symbols.type_ import Type
 
 __all__ = ["Translator", "VarTranslator", "FunctionTranslator"]
 
-JumpTable = namedtuple("JumpTable", ("label", "addresses"))
 LabelledData = namedtuple("LabelledData", ("label", "data"))
 
 

src/arch/z80/translatorvisitor.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 
 from collections import OrderedDict
+from typing import NamedTuple, List
+
 from src.api.errmsg import syntax_error_not_constant
 from src.api.errmsg import syntax_error_cant_convert_to_type
 from src.api.debug import __DEBUG__
@@ -25,6 +27,12 @@
 
 from .backend.runtime import RUNTIME_LABELS
 from .backend.runtime import LABEL_REQUIRED_MODULES
+from src.ast.tree import ChildrenList
+
+
+class JumpTable(NamedTuple):
+    label: str
+    addresses: ChildrenList
 
 
 class TranslatorVisitor(TranslatorInstVisitor):
@@ -48,7 +56,7 @@ class TranslatorVisitor(TranslatorInstVisitor):
 
     LOOPS = []  # Defined LOOPS
     STRING_LABELS = OrderedDict()
-    JUMP_TABLES = []
+    JUMP_TABLES: List[JumpTable] = []
 
     # Type code used in DATA
     DATA_TYPES = {"str": 1, "i8": 2, "u8": 3, "i16": 4, "u16": 5, "i32": 6, "u32": 7, "f16": 8, "f": 9}
@@ -163,11 +171,13 @@ def emit_strings(self):
 
     def emit_jump_tables(self):
         for table_ in self.JUMP_TABLES:
-            self.ic_vard(table_.label, [str(len(table_.addresses))] + ["##" + x.mangled for x in table_.addresses])
+            self.ic_vard(
+                table_.label, [f"#{str(len(table_.addresses))}"] + [f"##{x.mangled}" for x in table_.addresses]
+            )
 
     def _visit(self, node):
         if isinstance(node, Symbol):
-            __DEBUG__("Visiting {}".format(node.token), 1)
+            __DEBUG__(f"Visiting {node.token}", 1)
             if node.token in self.ATTR_TMP:
                 return self.visit_ATTR_TMP(node)
 

src/ast/tree.py

@@ -10,7 +10,7 @@
 
 from src.api.errors import Error
 
-__all__ = ["NotAnAstError", "Tree"]
+__all__ = ["NotAnAstError", "Tree", "ChildrenList"]
 
 
 class NotAnAstError(Error):

tests/functional/zx48k/ongosub.asm

@@ -101,13 +101,13 @@ _a:
 	DEFB 37h
 	DEFB 30h
 .LABEL.__LABEL0:
-	DEFB 4h
+	DEFB 4
 	DEFW .LABEL._40
 	DEFW .LABEL._50
 	DEFW .LABEL._60
 	DEFW .LABEL._70
 .LABEL.__LABEL1:
-	DEFB 2h
+	DEFB 2
 	DEFW .LABEL._50
 	DEFW .LABEL._60
 	;; --- end of user code ---

tests/functional/zx48k/ongoto.asm

@@ -84,7 +84,7 @@ _a:
 	DEFB 4Eh
 	DEFB 44h
 .LABEL.__LABEL0:
-	DEFB 3h
+	DEFB 3
 	DEFW .LABEL._10
 	DEFW .LABEL._20
 	DEFW .LABEL._30