Merge pull request #440 from boriel/bugfix/crash_upon_let_error_typing

Bugfix/crash upon let error typing

Author: boriel

src/api/__init__.py

@@ -12,3 +12,4 @@
 from src.api import debug  # noqa
 from src.api import errors  # noqa
 from src.api import errmsg  # noqa
+from src.api import symboltable  # noqa

src/api/global_.py

@@ -9,17 +9,22 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
+from typing import Dict
+from typing import Optional
+from typing import Set
+
+import src.api
+
+from .opcodestemps import OpcodesTemps
+from .constants import TYPE
+
 # ----------------------------------------------------------------------
 # Simple global container for internal constants.
 # Internal constants might be architecture dependant. They're set
 # on module init (at __init__.py) on api.arch.<arch>/init.py
 #
 # Don't touch unless you know what are you doing
 # ----------------------------------------------------------------------
-from typing import Dict
-
-from .opcodestemps import OpcodesTemps
-from .constants import TYPE
 
 # ----------------------------------------------------------------------
 # Initializes a singleton container
@@ -73,7 +78,7 @@
 # ----------------------------------------------------------------------
 # Global Symbol Table
 # ----------------------------------------------------------------------
-SYMBOL_TABLE = None  # Must be initialized with SymbolTable()
+SYMBOL_TABLE: Optional['src.api.symboltable.SymbolTable'] = None  # Must be initialized with SymbolTable()
 
 # ----------------------------------------------------------------------
 # Function calls pending to check
@@ -90,7 +95,7 @@
 # ----------------------------------------------------------------------
 # Initialization routines to be called automatically at program start
 # ----------------------------------------------------------------------
-INITS = set([])
+INITS: Set[str] = set([])
 
 # ----------------------------------------------------------------------
 # FUNCTIONS pending to translate after parsing stage
@@ -156,7 +161,7 @@
 # ----------------------------------------------------------------------
 # Cache of Message errors to avoid repetition
 # ----------------------------------------------------------------------
-error_msg_cache = set()
+error_msg_cache: Set[str] = set()
 
 
 # ----------------------------------------------------------------------

src/libzxbc/zxbparser.py

@@ -13,12 +13,14 @@
 # PI Constant
 # PI = 3.1415927 is ZX Spectrum PI representation
 # But a better one is 3.141592654, so take it from math
+
 import math
 from math import pi as PI
 import collections
 
 # typings
 from typing import NamedTuple
+from typing import Optional
 
 # Compiler API
 from src.api.debug import __DEBUG__  # analysis:ignore
@@ -181,15 +183,18 @@ def make_nop():
     return symbols.NOP()
 
 
-def make_number(value, lineno, type_=None):
+def make_number(value, lineno: int, type_=None):
     """ Wrapper: creates a constant number node.
     """
     return symbols.NUMBER(value, type_=type_, lineno=lineno)
 
 
-def make_typecast(type_, node, lineno):
+def make_typecast(type_: symbols.TYPE, node: Optional[symbols.SYMBOL], lineno: int):
     """ Wrapper: returns a Typecast node
     """
+    if node is None or node.type_ is None:
+        return  # syntax / semantic error
+
     assert isinstance(type_, symbols.TYPE)
     return symbols.TYPECAST.make_node(type_, node, lineno)
 
@@ -2906,6 +2911,13 @@ def p_function_header(p):
     p[0] = p[1]
 
 
+def p_function_header_error(p):
+    """ function_header : function_def error CO
+                        | function_def error NEWLINE
+    """
+    p[0] = None
+
+
 def p_function_header_pre(p):
     """ function_header_pre : function_def param_decl typedef
     """

src/parsetab/tabs.dbm.bak

@@ -1,4 +1,4 @@
 'zxbpp', (0, 72571)
 'asmparse', (72704, 254311)
 'zxnext_asmparse', (327168, 285299)
-'zxbparser', (612864, 712099)
+'zxbparser', (612864, 715296)

src/parsetab/tabs.dbm.dat

@@ -1,4 +1,4 @@
 'zxbpp', (0, 72571)
 'asmparse', (72704, 254311)
 'zxnext_asmparse', (327168, 285299)
-'zxbparser', (612864, 712099)
+'zxbparser', (612864, 715296)

src/parsetab/tabs.dbm.dir

@@ -11,6 +11,8 @@
 
 import numbers
 
+from typing import Optional
+
 from src.api.constants import CLASS
 from .symbol_ import Symbol
 from .type_ import SymbolTYPE
@@ -35,16 +37,15 @@ class SymbolNUMBER(Symbol):
     """ Defines an NUMBER symbol.
     """
 
-    def __init__(self, value, lineno, type_=None):
+    def __init__(self, value, lineno: int, type_: Optional[SymbolTYPE] = None):
         assert lineno is not None
         assert type_ is None or isinstance(type_, SymbolTYPE)
 
         if isinstance(value, SymbolNUMBER):
             value = value.value
 
         assert isinstance(value, numbers.Number)
-
-        super(SymbolNUMBER, self).__init__()
+        super().__init__()
         self.class_ = CLASS.const
 
         if int(value) == value:

src/symbols/number.py

@@ -0,0 +1,9 @@
+DIM a as Ubyte
+
+FUNCTION editStringFN(ByREF s AS Byte) as s
+    s = s + 1
+    RETURN s
+END FUNCTION
+
+a = editStringFN(a, 1, "i")
+

tests/functional/let_expr_type_crash.bas

@@ -176,6 +176,9 @@ prepro76.bi:2: error: this is an intended error
 line_asm.bi:26: warning: this should be line 26
 >>> process_file('line_err.bas')
 line_err.bas:5: error: Variable 'q' already declared at line_err.bas:1
+>>> process_file('let_expr_type_crash.bas')
+let_expr_type_crash.bas:3: error: Syntax Error. Unexpected token 's' <ID>
+let_expr_type_crash.bas:8: error: Function 'editStringFN' takes 0 parameters, not 3
 
 # Test warning silencing
 >>> process_file('mcleod3.bas', ['-S', '-q', '-O --expect-warnings=2'])
@@ -184,3 +187,4 @@ mcleod3.bas:3: error: 'GenerateSpaces' is neither an array nor a function.
 >>> process_file('doloop2.bas', ['-S', '-q', '-O -W110'])
 doloop2.bas:4: warning: [W100] Using default implicit type 'ubyte' for 'a'
 doloop2.bas:4: warning: [W150] Variable 'a' is never used
+