Put labels into LABEL namespace

Author: boriel

src/api/global_.py

@@ -122,6 +122,11 @@
 # ----------------------------------------------------------------------
 DATAS_NAMESPACE = '.DATA'
 
+# ----------------------------------------------------------------------
+# LABEL Labels namespace
+# ----------------------------------------------------------------------
+LABELS_NAMESPACE = '.LABEL'
+
 # ----------------------------------------------------------------------
 # Data Type used for string chars index. Must be an integral
 # ----------------------------------------------------------------------

src/api/symboltable.py

@@ -692,8 +692,8 @@ def declare_label(self, id_: str, lineno: int) -> Optional[SymbolLABEL]:
             # HINT: ??? Mangled name. Just the label, 'cause it starts with '.'
             entry.mangled = '%s' % id_
         else:
-            # HINT: Mangled name. Labels are __LABEL__
-            entry.mangled = '__LABEL__%s' % entry.name
+            # TODO: This shouln't be needed (but still is). Need investigation
+            entry.mangled = f'{global_.LABELS_NAMESPACE}.{symbols.LABEL.prefix}{entry.name}'
 
         entry.is_line_number = isinstance(id1, int)
 

src/arch/zx48k/backend/__common.py

@@ -7,7 +7,9 @@
 from typing import List
 from typing import Set
 
+import src.api.global_ as gl
 import src.api.errors
+
 from .runtime import RUNTIME_LABELS
 from .runtime import LABEL_REQUIRED_MODULES
 
@@ -69,7 +71,7 @@ def tmp_label() -> str:
     global LABEL_COUNTER
     global TMP_LABELS
 
-    result = '__LABEL%i' % LABEL_COUNTER
+    result = f'{gl.LABELS_NAMESPACE}.__LABEL{LABEL_COUNTER}'
     TMP_LABELS.add(result)
     LABEL_COUNTER += 1
 

src/arch/zx48k/backend/__init__.py

@@ -2331,7 +2331,7 @@ def remove_unused_labels(output: List[str]):
                 labels_to_delete.pop(new_label, None)
 
                 if new_label != op:
-                    output[i] = re.sub(r'\b' + op + r'\b', new_label, ins)
+                    output[i] = re.sub(f"((?<![.a-zA-Z0-9_])){op.replace('.', '[.]')}(?=$|\\s)", new_label, ins)
 
     for i in sorted(labels_to_delete.values(), reverse=True):
         output.pop(i)

src/symbols/label.py

@@ -9,6 +9,8 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
+from src.api import global_
+
 from src.api.constants import CLASS
 from .var import SymbolVAR
 from .symbol_ import Symbol
@@ -18,16 +20,11 @@ class SymbolLABEL(SymbolVAR):
     prefix = '__LABEL__'
 
     def __init__(self, name, lineno):
-        super(SymbolLABEL, self).__init__(name, lineno)
+        super().__init__(name, lineno)
+        self.mangled = f"{global_.LABELS_NAMESPACE}.{self.prefix}{name}"
         self.class_ = CLASS.label
         self._scope_owner = []  # list of nested functions containing this label (scope)
 
-    @property
-    def t(self):
-        """ t property is constant for labels
-        """
-        return self.prefix + self.name
-
     @property
     def accessed(self):
         return self._accessed