Move core namespace to .core

Author: boriel

src/api/global_.py

@@ -120,7 +120,7 @@
 # ----------------------------------------------------------------------
 # CORE namespace (for core runtime library, like FP Calc)
 # ----------------------------------------------------------------------
-CORE_NAMESPACE = 'core'
+CORE_NAMESPACE = '.core'
 
 # ----------------------------------------------------------------------
 # DATA Labels namespace
@@ -135,8 +135,8 @@
 # ----------------------------------------------------------------------
 # USER DATA LABELS
 # ----------------------------------------------------------------------
-ZXBASIC_USER_DATA = f".{CORE_NAMESPACE}.ZXBASIC_USER_DATA"
-ZXBASIC_USER_DATA_LEN = f".{CORE_NAMESPACE}.ZXBASIC_USER_DATA_LEN"
+ZXBASIC_USER_DATA = f"{CORE_NAMESPACE}.ZXBASIC_USER_DATA"
+ZXBASIC_USER_DATA_LEN = f"{CORE_NAMESPACE}.ZXBASIC_USER_DATA_LEN"
 
 
 # ----------------------------------------------------------------------

src/arch/zx48k/backend/__init__.py

@@ -124,8 +124,8 @@
 END_LABEL = f'{NAMESPACE}.__END_PROGRAM'
 CALL_BACK = f'{NAMESPACE}.__CALL_BACK__'
 MAIN_LABEL = f'{NAMESPACE}.__MAIN_PROGRAM__'
-DATA_LABEL = global_.ZXBASIC_USER_DATA.lstrip('.')
-DATA_END_LABEL = f'{DATA_LABEL}_END'.lstrip('.')
+DATA_LABEL = global_.ZXBASIC_USER_DATA
+DATA_END_LABEL = f'{DATA_LABEL}_END'
 
 # Whether to use the FunctionExit scheme
 FLAG_use_function_exit = False

src/arch/zx48k/library-asm/heapinit.asm

@@ -65,7 +65,7 @@
 ; An init directive is useful for initialization routines.
 ; They will be added automatically if needed.
 
-#init "core.__MEM_INIT"
+#init ".core.__MEM_INIT"
 
 
 ; ---------------------------------------------------------------------

src/arch/zx48k/library-asm/print.asm

@@ -21,7 +21,7 @@
 ; Putting a comment starting with @INIT <address>
 ; will make the compiler to add a CALL to <address>
 ; It is useful for initialization routines.
-#init core.__PRINT_INIT
+#init .core.__PRINT_INIT
 
     push namespace core
 

src/zxbasm/asmparse.py

@@ -13,9 +13,11 @@
 
 import os
 
+from typing import Any
 from typing import List
 from typing import Optional
 from typing import Tuple
+from typing import NamedTuple
 
 import src.ply.yacc as yacc
 import src.api.utils
@@ -192,15 +194,11 @@ def argval(self):
         return super(Asm, self).argval()
 
 
-class Container(object):
+class Container(NamedTuple):
     """ Single class container
     """
-
-    def __init__(self, item, lineno):
-        """ Item to store
-        """
-        self.item = item
-        self.lineno = lineno
+    item: Any
+    lineno: int
 
 
 class Expr(Ast):
@@ -329,7 +327,7 @@ def makenode(cls, symbol, *nexts):
         return result
 
 
-class Label(object):
+class Label:
     """ A class to store Label information (NAME, linenumber and Address)
     """
 
@@ -384,7 +382,7 @@ def name(self):
         return self._name
 
 
-class Memory(object):
+class Memory:
     """ A class to describe memory
     """
 
@@ -763,13 +761,13 @@ def p_LOCAL(p):
 def p_idlist(p):
     """ id_list : ID
     """
-    p[0] = ((p[1], p.lineno(1)),)
+    p[0] = (Container(p[1], p.lineno(1)),)
 
 
 def p_idlist_id(p):
     """ id_list : id_list COMMA ID
     """
-    p[0] = p[1] + ((p[3], p.lineno(3)),)
+    p[0] = p[1] + (Container(p[3], p.lineno(3)),)
 
 
 def p_DEFB(p):  # Define bytes
@@ -1531,7 +1529,7 @@ def p_preprocessor_line_line_file(p):
 def p_preproc_line_init(p):
     """ preproc_line : _INIT STRING
     """
-    INITS.append((p[2].strip('"'), p.lineno(2)))
+    INITS.append(Container(p[2].strip('"'), p.lineno(2)))
 
 
 # --- YYERROR

src/zxbc/zxbc.py

@@ -28,7 +28,7 @@
 from . import args_parser
 
 
-RE_INIT = re.compile(r'^#[ \t]*init[ \t]+((?:[_a-zA-Z][._a-zA-Z0-9]*)|(?:"[_a-zA-Z][._a-zA-Z0-9]*"))[ \t]*$',
+RE_INIT = re.compile(r'^#[ \t]*init[ \t]+((?:[._a-zA-Z][._a-zA-Z0-9]*)|(?:"[._a-zA-Z][._a-zA-Z0-9]*"))[ \t]*$',
                      re.IGNORECASE)