Refactorize TMP_ATTRs

Author: boriel

src/arch/zx48k/backend/runtime/io.py

@@ -7,6 +7,8 @@
 class IOLabels:
     # Screen and attributes
     CLS = f"{NAMESPACE}CLS"
+    COPY_ATTR = f"{NAMESPACE}COPY_ATTR"
+
     BOLD = f"{NAMESPACE}BOLD"
     BRIGHT = f"{NAMESPACE}BRIGHT"
     FLASH = f"{NAMESPACE}FLASH"
@@ -16,6 +18,15 @@ class IOLabels:
     OVER = f"{NAMESPACE}OVER"
     PAPER = f"{NAMESPACE}PAPER"
 
+    BOLD_TMP = f"{NAMESPACE}BOLD_TMP"
+    BRIGHT_TMP = f"{NAMESPACE}BRIGHT_TMP"
+    FLASH_TMP = f"{NAMESPACE}FLASH_TMP"
+    INK_TMP = f"{NAMESPACE}INK_TMP"
+    INVERSE_TMP = f"{NAMESPACE}INVERSE_TMP"
+    ITALIC_TMP = f"{NAMESPACE}ITALIC_TMP"
+    OVER_TMP = f"{NAMESPACE}OVER_TMP"
+    PAPER_TMP = f"{NAMESPACE}PAPER_TMP"
+
     # Drawing primitives
     CIRCLE = f"{NAMESPACE}CIRCLE"
     DRAW = f"{NAMESPACE}DRAW"
@@ -45,6 +56,8 @@ class IOLabels:
 
 REQUIRED_MODULES = {
     IOLabels.CLS: 'cls.asm',
+    IOLabels.COPY_ATTR: 'copy_attr.asm',
+
     IOLabels.BOLD: 'bold.asm',
     IOLabels.BRIGHT: 'bright.asm',
     IOLabels.FLASH: 'flash.asm',
@@ -54,6 +67,15 @@ class IOLabels:
     IOLabels.OVER: 'over.asm',
     IOLabels.PAPER: 'paper.asm',
 
+    IOLabels.BOLD_TMP: 'bold.asm',
+    IOLabels.BRIGHT_TMP: 'bright.asm',
+    IOLabels.FLASH_TMP: 'flash.asm',
+    IOLabels.INK_TMP: 'ink.asm',
+    IOLabels.INVERSE_TMP: 'inverse.asm',
+    IOLabels.ITALIC_TMP: 'italic.asm',
+    IOLabels.OVER_TMP: 'over.asm',
+    IOLabels.PAPER_TMP: 'paper.asm',
+
     IOLabels.CIRCLE: 'circle.asm',
     IOLabels.DRAW: 'draw.asm',
     IOLabels.DRAW3: 'draw3.asm',

src/arch/zx48k/translatorvisitor.py

@@ -15,6 +15,8 @@
 from src.symbols.type_ import Type
 
 from . import backend
+from .backend.runtime import Labels as RuntimeLabel
+
 from src import symbols
 
 from src.api.errors import InvalidOperatorError
@@ -113,10 +115,18 @@ def visit_BLOCK(self, node):
     def visit_ATTR_TMP(self, node):
         yield node.children[0]
         self.ic_fparam(node.children[0].type_, node.children[0].t)
-        self.ic_call(node.token, 0)  # Procedure call. Discard return
-        ifile = node.token.lower()
-        ifile = ifile[:ifile.index('_')]
-        backend.REQUIRES.add(ifile + '.asm')
+
+        label = {
+            'INK_TMP': RuntimeLabel.INK_TMP,
+            'PAPER_TMP': RuntimeLabel.PAPER_TMP,
+            'FLASH_TMP': RuntimeLabel.FLASH_TMP,
+            'BRIGHT_TMP': RuntimeLabel.BRIGHT_TMP,
+            'INVERSE_TMP': RuntimeLabel.INVERSE_TMP,
+            'OVER_TMP': RuntimeLabel.OVER_TMP,
+            'BOLD_TMP': RuntimeLabel.BOLD_TMP,
+            'ITALIC_TMP': RuntimeLabel.ITALIC_TMP
+        }[node.token]
+        self.runtime_call(label, 0)  # Procedure call. Discard return
 
     def runtime_call(self, label: str, num: int):
         assert label in RUNTIME_LABELS, f"Unknown label {label}"
@@ -184,8 +194,7 @@ def norm_attr(self):
             return
 
         self.HAS_ATTR = False
-        self.ic_call('COPY_ATTR', 0)
-        backend.REQUIRES.add('copy_attr.asm')
+        self.runtime_call(RuntimeLabel.COPY_ATTR, 0)
 
     @staticmethod
     def traverse_const(node):