refact: Memory.declare_label() returns None

Improve typing.
Also do some code clean up in asmlex.py

Author: boriel

src/zxbasm/asmlex.py

@@ -12,16 +12,20 @@
 # ----------------------------------------------------------------------
 
 import sys
+from typing import Tuple
 
 from src.ply import lex
 from src.api.config import OPTIONS
 from src.api.errmsg import error
 
-_tokens = ('STRING', 'NEWLINE', 'CO',
-           'ID', 'COMMA', 'PLUS', 'MINUS', 'LB', 'RB', 'LP', 'RP', 'LPP', 'RPP', 'MUL', 'DIV', 'POW', 'MOD',
-           'UMINUS', 'APO', 'INTEGER', 'ADDR',
-           'LSHIFT', 'RSHIFT', 'BAND', 'BOR', 'BXOR'
-           )
+
+_tokens: Tuple[str, ...] = (
+    'STRING', 'NEWLINE', 'CO',
+    'ID', 'COMMA', 'PLUS', 'MINUS', 'LB', 'RB',
+    'LP', 'RP', 'LPP', 'RPP', 'MUL', 'DIV', 'POW',
+    'MOD', 'UMINUS', 'APO', 'INTEGER', 'ADDR',
+    'LSHIFT', 'RSHIFT', 'BAND', 'BOR', 'BXOR'
+)
 
 reserved_instructions = {
     'adc': 'ADC',
@@ -173,7 +177,7 @@
 }
 
 # List of token names.
-_tokens = sorted(
+_tokens = tuple(sorted(
     _tokens +
     tuple(reserved_instructions.values()) +
     tuple(pseudo.values()) +
@@ -182,7 +186,7 @@
     tuple(flags.values()) +
     tuple(zx_next_mnemonics.values()) +
     tuple(preprocessor.values())
-)
+))
 
 keywords = set(
     flags.keys()).union(
@@ -218,20 +222,17 @@ class Lexer(object):
 
     # -------------- TOKEN ACTIONS --------------
 
-    def __set_lineno(self, value):
-        """ Setter for lexer.lineno
-        """
-        self.lex.lineno = value
-
-    def __get_lineno(self):
+    @property
+    def lineno(self) -> int:
         """ Getter for lexer.lineno
         """
-        if self.lex is None:
-            return 0
-
-        return self.lex.lineno
+        return 0 if self.lex is None else self.lex.lineno
 
-    lineno = property(__get_lineno, __set_lineno)
+    @lineno.setter
+    def lineno(self, value: int):
+        """ Setter for lexer.lineno
+        """
+        self.lex.lineno = value
 
     def t_INITIAL_preproc_skip(self, t):
         r'[ \t]+'
@@ -442,10 +443,10 @@ def __init__(self):
         self.tokens = tokens
         self.next_token = None  # if set to something, this will be returned once
 
-    def input(self, str):
+    def input(self, s: str):
         """ Defines input string, removing current lexer.
         """
-        self.input_data = str
+        self.input_data = s
         self.lex = lex.lex(object=self)
         self.lex.input(self.input_data)
 
@@ -454,17 +455,15 @@ def token(self):
 
     def find_column(self, token):
         """ Compute column:
-                - token is a token instance
+            :param token: token instance
         """
         i = token.lexpos
         while i > 0:
             if self.input_data[i - 1] == '\n':
                 break
             i -= 1
 
-        column = token.lexpos - i + 1
-
-        return column
+        return token.lexpos - i + 1
 
 
 # --------------------- PREPROCESSOR FUNCTIONS -------------------

src/zxbasm/memory.py

@@ -1,3 +1,4 @@
+from collections import defaultdict
 from typing import Dict, List, Optional, Tuple
 
 from src.api import global_ as gl
@@ -23,6 +24,8 @@ def __init__(self, org: int = 0):
         self.memory_bytes: Dict[int, int] = {}  # An array (associative) containing memory bytes
         self.local_labels: List[Dict[str, Label]] = [{}]  # Local labels in the current memory scope
         self.global_labels = self.local_labels[0]  # Global memory labels
+        self.tmp_labels: Dict[int, Dict[str, Label]] = defaultdict(dict)
+        self.tmp_labels_lines: List[int] = []
         self.ORG = org  # last ORG value set
         self.scopes: List[int] = []
 
@@ -181,7 +184,7 @@ def declare_label(
             value: int = None,
             local: bool = False,
             namespace: Optional[str] = None
-    ):
+    ) -> None:
         """ Sets a label with the given value or with the current address (org)
         if no value is passed.
 
@@ -206,8 +209,6 @@ def declare_label(
 
         self.set_memory_slot()
 
-        return self.local_labels[-1][ex_label]
-
     def get_label(self, label: str, lineno: int) -> Label:
         """ Returns a label in the current context or in the global one.
         If the label does not exists, creates a new one and returns it.

src/zxbasm/zxbasm.py

@@ -18,6 +18,8 @@
 from src.zxbpp import zxbpp
 
 import src.api.config
+
+from src.api import errmsg
 from src.api.config import OPTIONS
 from src.api import global_
 
@@ -120,7 +122,7 @@ def main(args=None):
         return 1
 
     if not asmparse.MEMORY.memory_bytes:  # empty seq.
-        asmparse.warning(0, "Nothing to assemble. Exiting...")
+        errmsg.warning(0, "Nothing to assemble. Exiting...")
         return 0
 
     current_org = max(asmparse.MEMORY.memory_bytes.keys() or [0]) + 1