Refactorize ZXBASIC_USER_DATA labels

Author: boriel

src/api/global_.py

@@ -117,6 +117,11 @@
 # ----------------------------------------------------------------------
 SIZE_TYPE = None
 
+# ----------------------------------------------------------------------
+# CORE namespace (for core runtime library, like FP Calc)
+# ----------------------------------------------------------------------
+CORE_NAMESPACE = 'core.'
+
 # ----------------------------------------------------------------------
 # DATA Labels namespace
 # ----------------------------------------------------------------------
@@ -127,6 +132,13 @@
 # ----------------------------------------------------------------------
 LABELS_NAMESPACE = '.LABEL'
 
+# ----------------------------------------------------------------------
+# USER DATA LABELS
+# ----------------------------------------------------------------------
+ZXBASIC_USER_DATA = f".{CORE_NAMESPACE}ZXBASIC_USER_DATA"
+ZXBASIC_USER_DATA_LEN = f".{CORE_NAMESPACE}ZXBASIC_USER_DATA_LEN"
+
+
 # ----------------------------------------------------------------------
 # Data Type used for string chars index. Must be an integral
 # ----------------------------------------------------------------------

src/api/symboltable.py

@@ -688,9 +688,8 @@ def declare_label(self, id_: str, lineno: int) -> Optional[SymbolLABEL]:
             entry = symbols.VAR.to_label(entry)
 
         if id_[0] == '.':
-            id_ = id_[1:]
-            # HINT: ??? Mangled name. Just the label, 'cause it starts with '.'
-            entry.mangled = '%s' % id_
+            # Just the label, because it starts with '.' so it's a root-global label
+            entry.mangled = f'{id_}'
         else:
             # TODO: This shouln't be needed (but still is). Need investigation
             entry.mangled = f'{global_.LABELS_NAMESPACE}.{symbols.LABEL.prefix}{entry.name}'

src/arch/zx48k/backend/__init__.py

@@ -11,6 +11,8 @@
 from typing import List
 from typing import Set
 
+from src.api import global_
+
 from . import errors
 from .errors import InvalidICError as InvalidIC
 
@@ -122,8 +124,8 @@
 END_LABEL = f'{NAMESPACE}__END_PROGRAM'
 CALL_BACK = f'{NAMESPACE}__CALL_BACK__'
 MAIN_LABEL = f'{NAMESPACE}__MAIN_PROGRAM__'
-DATA_LABEL = f'{NAMESPACE}ZXBASIC_USER_DATA'
-DATA_END_LABEL = f'{NAMESPACE}ZXBASIC_USER_DATA_END'
+DATA_LABEL = global_.ZXBASIC_USER_DATA.lstrip('.')
+DATA_END_LABEL = f'{DATA_LABEL}_END'.lstrip('.')
 
 # Whether to use the FunctionExit scheme
 FLAG_use_function_exit = False

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

@@ -1,3 +1,5 @@
 # Define just the main Private namespace
 
-NAMESPACE = 'core.'
+from src.api import global_
+
+NAMESPACE = global_.CORE_NAMESPACE

src/zxbc/zxbparser.py

@@ -516,8 +516,8 @@ def p_start(p):
     """
     global ast, data_ast
 
-    make_label('.ZXBASIC_USER_DATA', 0)
-    make_label('.ZXBASIC_USER_DATA_LEN', 0)
+    make_label(gl.ZXBASIC_USER_DATA, 0)
+    make_label(gl.ZXBASIC_USER_DATA_LEN, 0)
 
     if PRINT_IS_USED:
         zxbpp.ID_TABLE.define('___PRINT_IS_USED___', 1)
@@ -2231,10 +2231,10 @@ def p_save_data(p):
         else:
             length = make_number(entry.type_.size, lineno=p.lineno(4))
     else:
-        access = SYMBOL_TABLE.access_label('.ZXBASIC_USER_DATA', p.lineno(3), SYMBOL_TABLE.global_scope)
+        access = SYMBOL_TABLE.access_label(gl.ZXBASIC_USER_DATA, p.lineno(3), SYMBOL_TABLE.global_scope)
         start = make_unary(p.lineno(3), 'ADDRESS', access, type_=TYPE.uinteger)
 
-        access = SYMBOL_TABLE.access_label('.ZXBASIC_USER_DATA_LEN', p.lineno(3), SYMBOL_TABLE.global_scope)
+        access = SYMBOL_TABLE.access_label(gl.ZXBASIC_USER_DATA_LEN, p.lineno(3), SYMBOL_TABLE.global_scope)
         length = make_unary(p.lineno(3), 'ADDRESS', access, type_=TYPE.uinteger)
 
     p[0] = make_sentence(p.lineno(1), p[1], p[2], start, length)
@@ -2300,10 +2300,10 @@ def p_load_data(p):
         else:
             length = make_number(entry.type_.size, lineno=p.lineno(4))
     else:
-        entry = SYMBOL_TABLE.access_label('.ZXBASIC_USER_DATA', p.lineno(3), SYMBOL_TABLE.global_scope)
+        entry = SYMBOL_TABLE.access_label(gl.ZXBASIC_USER_DATA, p.lineno(3), SYMBOL_TABLE.global_scope)
         start = make_unary(p.lineno(3), 'ADDRESS', entry, type_=TYPE.uinteger)
 
-        entry = SYMBOL_TABLE.access_label('.ZXBASIC_USER_DATA_LEN', p.lineno(3), SYMBOL_TABLE.global_scope)
+        entry = SYMBOL_TABLE.access_label(gl.ZXBASIC_USER_DATA_LEN, p.lineno(3), SYMBOL_TABLE.global_scope)
         length = make_unary(p.lineno(3), 'ADDRESS', entry, type_=TYPE.uinteger)
 
     p[0] = make_sentence(p.lineno(3), p[1], p[2], start, length)