feat: implement temporary labels

Also allows numbers with _ in the ASM context!

Author: boriel

src/zxbasm/asmlex.py

@@ -246,7 +246,7 @@ def t_CHAR(self, t):
         return t
 
     def t_HEXA(self, t):
-        r'([0-9][0-9a-fA-F]*[hH])|(\$[0-9a-fA-F]+)|(0x[0-9a-fA-F]+)'
+        r'([0-9](_?[0-9a-fA-F])*[hH])|(\$[0-9a-fA-F](_?[0-9a-fA-F])*)|(0x[0-9a-fA-F](_?[0-9a-dA-F])*)'
 
         if t.value[:2] == '0x':
             t.value = t.value[2:]  # Remove initial 0x
@@ -255,22 +255,22 @@ def t_HEXA(self, t):
         else:
             t.value = t.value[:-1]  # Remove last 'h'
 
-        t.value = int(t.value, 16)  # Convert to decimal
+        t.value = int(t.value.replace('_', ''), 16)  # Convert to decimal
         t.type = 'INTEGER'
         return t
 
     def t_BIN(self, t):
-        r'(%[01]+)|([01]+[bB])'  # A Binary integer
+        r'(%[01](_?[01])*)|(0[bB](_?[01])+)'  # A Binary integer
         # Note 00B is a 0 binary, but
         # 00Bh is a 12 in hex. So this pattern must come
         # after HEXA
 
         if t.value[0] == '%':
             t.value = t.value[1:]  # Remove initial %
         else:
-            t.value = t.value[:-1]  # Remove last 'b'
+            t.value = t.value[2:]  # Remove last 'b'
 
-        t.value = int(t.value, 2)  # Convert to decimal
+        t.value = int(t.value.replace('_', ''), 2)  # Convert to decimal
         t.type = 'INTEGER'
         return t
 
@@ -281,8 +281,8 @@ def t_INITIAL_TMPLABEL(self, t):
         return t
 
     def t_INITIAL_preproc_INTEGER(self, t):
-        r'[0-9]+'  # an integer decimal number
-        t.value = int(t.value)
+        r'[0-9](_?\d)*'  # an integer decimal number
+        t.value = int(t.value.replace('_', ''))
         return t
 
     def t_INITIAL_ID(self, t):

src/zxbasm/memory.py

@@ -40,7 +40,6 @@ def enter_proc(self, lineno: int):
         """
         self.local_labels.append({})  # Add a new context
         self.scopes.append(lineno)
-        self.clear_temporary_labels()
         __DEBUG__('Entering scope level %i at line %i' % (len(self.scopes), lineno))
 
     def set_org(self, value: int, lineno: int):
@@ -118,7 +117,6 @@ def exit_proc(self, lineno: int):
 
         self.local_labels.pop()  # Removes current context
         self.scopes.pop()
-        self.clear_temporary_labels()
 
     def set_memory_slot(self):
         if self.org not in self.orgs:

tests/functional/hex_num.asm

@@ -0,0 +1,5 @@
+
+
+ld a, $1f
+ld a, $1e
+

tests/functional/hex_num.bin

@@ -0,0 +1 @@
+>>

tests/functional/tmp_label0.asm

@@ -0,0 +1,7 @@
+1:
+ld hl, 1b
+ld hl, (1b)
+ld hl, 1f
+ld hl, (1f)
+1:
+

tests/functional/tmp_label0.bin

@@ -0,0 +1,4 @@
+1:
+nop
+ld hl, 1f
+

tests/functional/tmp_label1.asm

@@ -0,0 +1,4 @@
+
+ld hl, 1b
+1:
+

tests/functional/tmp_label2.asm

@@ -0,0 +1,7 @@
+;; Cannot access labels in different namespaces
+push namespace test
+1:
+pop namespace
+
+ld hl, 1b
+

tests/functional/tmp_label3.asm

@@ -0,0 +1,9 @@
+
+1:
+push namespace test
+nop
+1:
+ld hl, 1b
+pop namespace
+ld hl, 1b
+