Merge pull request #411 from boriel/bugfix/invalid_include_filename_error

Bugfix/invalid include filename error

Author: boriel

src/api/errmsg.py

@@ -10,6 +10,8 @@
 # ----------------------------------------------------------------------
 
 import sys
+from typing import Optional
+
 from . import global_
 from .config import OPTIONS
 
@@ -31,7 +33,7 @@ def info(msg):
     OPTIONS.stderr.write("info: %s\n" % msg)
 
 
-def error(lineno, msg, fname=None):
+def error(lineno, msg, fname: Optional[str] = None):
     """ Generic syntax error routine
     """
     if fname is None:
@@ -49,7 +51,7 @@ def error(lineno, msg, fname=None):
     global_.has_errors += 1
 
 
-def warning(lineno, msg, fname=None):
+def warning(lineno, msg, fname: Optional[str] = None):
     """ Generic warning error routine
     """
     if fname is None:

src/libzxbc/zxbparser.py

@@ -3490,11 +3490,9 @@ def p_error(p):
 
     if p is not None:
         if p.type != 'NEWLINE':
-            msg = "Syntax Error. Unexpected token '%s' <%s>" % \
-                  (p.value, p.type)
-
+            msg = "Syntax Error. Unexpected token '%s' <%s>" % (p.value, p.type)
         else:
-            msg = "Unexpected end of file"
+            msg = "Unexpected end of line"
         error(p.lexer.lineno, msg)
     else:
         msg = "Unexpected end of file"

src/libzxbpp/prepro/output.py

@@ -6,14 +6,17 @@
 Need the global OPTION object
 """
 
+from typing import Optional
+
 import src.api.errmsg
 
+
 CURRENT_FILE = []  # The current file being processed
 
 
-def error(lineno, str_):
-    src.api.errmsg.error(lineno, str_)
+def error(lineno, str_, fname: Optional[str] = None):
+    src.api.errmsg.error(lineno, str_, fname=fname)
 
 
-def warning(lineno, str_):
-    src.api.errmsg.warning(lineno, str_)
+def warning(lineno, str_, fname: Optional[str] = None):
+    src.api.errmsg.warning(lineno, str_, fname=fname)

src/libzxbpp/zxbpp.py

@@ -740,10 +740,14 @@ def p_argstring_argstring(p):
 
 def p_error(p):
     if p is not None:
-        value = p.value
-        value = ''.join(['|%s|' % hex(ord(x)) if x < ' ' else x for x in value])
-        error(p.lineno, "syntax error. Unexpected token '%s' [%s]" %
-              (value, p.type))
+        if p.type == 'NEWLINE':
+            error(p.lineno, "Syntax error. Unexpected end of line", output.CURRENT_FILE[-1])
+        elif p.type == '_ENDFILE_':
+            error(p.lineno, "Syntax error. Unexpected end of file", output.CURRENT_FILE[-1])
+        else:
+            value = p.value
+            value = ''.join(['|%s|' % hex(ord(x)) if x < ' ' else x for x in value])
+            error(p.lineno, "Syntax error. Unexpected token '%s' [%s]" % (value, p.type), output.CURRENT_FILE[-1])
     else:
         OPTIONS.stderr.write("General syntax error at preprocessor "
                              "(unexpected End of File?)")
@@ -804,7 +808,7 @@ def main(argv):
     return global_.has_errors
 
 
-parser = src.api.utils.get_or_create('zxbppparse', lambda: yacc.yacc())
+parser = yacc.yacc()
 parser.defaulted_states = {}
 ID_TABLE = DefinesTable()
 

src/libzxbpp/zxbpplex.py

@@ -422,6 +422,8 @@ def include(self, filename):
     def include_end(self):
         """ Performs and end of include.
         """
+        old_lineno = self.lex.lineno
+        old_lexpos = self.lex.lexpos
         self.lex = self.filestack[-1][2]
         self.input_data = self.filestack[-1][3]
         self.filestack.pop()
@@ -434,8 +436,8 @@ def include_end(self):
         result = lex.LexToken()
         result.value = self.put_current_line(suffix='\n')
         result.type = '_ENDFILE_'
-        result.lineno = self.lex.lineno
-        result.lexpos = self.lex.lexpos
+        result.lineno = old_lineno
+        result.lexpos = old_lexpos
 
         return result
 

tests/functional/due_inc_main.bas

@@ -0,0 +1,8 @@
+' Main.bas
+
+#include "due_par.bas"
+
+Test(5)
+
+pause 0 
+

tests/functional/due_par.bas

@@ -0,0 +1,4 @@
+SUB test(code as Ubyte)
+	k=in(12234
+END SUB
+

tests/functional/test_errmsg.txt

@@ -163,4 +163,8 @@ llb.bas:3: error: Undeclared function "f$"
 >>> process_file('opt2_include_unused.bas')
 func0.bas:5: warning: Using default implicit type 'float' for 'f'
 func0.bas:4: warning: Function 'f' is never called and has been ignored
-
+>>> process_file('due_par.bas')
+due_par.bas:2: error: Syntax error. Unexpected end of line
+>>> process_file('due_inc_main.bas')
+due_par.bas:2: error: Syntax error. Unexpected end of line
+due_par.bas:5: error: Syntax error. Unexpected end of file