Merge pull request #447 from boriel/bugfix/msg_line_numbers_reporting

Put line after macro

Author: boriel

src/libzxbc/zxblex.py

@@ -225,6 +225,14 @@ def t_BNOT(t):
     return t
 
 
+def t_initial_PREPROC_LINE(t):
+    r'\#[ \t]*[Ll][Ii][Nn][Ee][ \t]+([0-9]+)(?:[ \t]+"((?:[^"]|"")*)")?[ \t]*\r?\n'
+
+    match = re.match('#[ \t]*[Ll][Ii][Nn][Ee][ \t]+([0-9]+)(?:[ \t]+"((?:[^"]|"")*)")?[ \t]*\r?\n', t.value)
+    t.lexer.lineno = int(match.groups()[0])
+    global_.FILENAME = match.groups()[1] or global_.FILENAME
+
+
 def t_INITIAL_SHARP(t):
     r'\#'
 

src/libzxbc/zxbparser.py

@@ -3158,24 +3158,17 @@ def p_type(p):
     p[0] = p[1].lower()
 
 
-# Some preprocessor directives
-def p_preprocessor_line(p):
-    """ preproc_line : preproc_line_line
-    """
-
-
-def p_preprocessor_line_line(p):
-    """ preproc_line_line : _LINE INTEGER
-    """
-    p.lexer.lineno = int(p[2]) + p.lexer.lineno - p.lineno(2)
-
-
-def p_preprocessor_line_line_file(p):
-    """ preproc_line_line : _LINE INTEGER STRING
-    """
-    p.lexer.lineno = int(p[2]) + p.lexer.lineno - p.lineno(3) - 1
-    gl.FILENAME = p[3]
+# region PREPROC
 
+# ----------------------------------------
+# PREPROCESSOR lines starting with:
+#
+#  #pragma
+#  #init
+#  #require
+#
+# are processed here and not in the lexer
+# ----------------------------------------
 
 def p_preproc_line_init(p):
     """ preproc_line : _INIT ID
@@ -3510,7 +3503,7 @@ def p_error(p):
             msg = "Syntax Error. Unexpected token '%s' <%s>" % (p.value, p.type)
         else:
             msg = "Unexpected end of line"
-        error(p.lexer.lineno, msg)
+        error(p.lineno, msg)
     else:
         msg = "Unexpected end of file"
         error(zxblex.lexer.lineno, msg)

src/libzxbpp/prepro/macrocall.py

@@ -99,9 +99,6 @@ def __call__(self, symbolTable: 'prepro.DefinesTable' = None) -> str:
             table.set(id_.args[i].name, self.lineno, args[i])
 
         tmp = id_(table)
-        if '\n' in tmp:
-            tmp += '\n#line %i\n' % self.lineno
-
         return tmp
 
     def is_defined(self, symbolTable: 'prepro.DefinesTable' = None) -> bool:

src/libzxbpp/zxbpp.py

@@ -14,7 +14,11 @@
 import sys
 import os
 import argparse
-from typing import NamedTuple, List
+
+from typing import Any
+from typing import List
+from typing import NamedTuple
+from typing import Optional
 
 from .zxbpplex import tokens  # noqa
 from src.libzxbpp import zxbpplex
@@ -47,7 +51,7 @@
 CURRENT_DIR = None
 
 # Default include path
-INCLUDEPATH = ['library', 'library-asm']
+INCLUDEPATH: List[str] = ['library', 'library-asm']
 
 # Enabled to FALSE if IFDEF failed
 ENABLED: bool = True
@@ -100,7 +104,7 @@ def init():
     del output.CURRENT_FILE[:]
 
 
-def get_include_path():
+def get_include_path() -> str:
     """ Default include path using a tricky sys calls.
     """
     return os.path.realpath(os.path.join(
@@ -117,7 +121,7 @@ def set_include_path():
     INCLUDEPATH = [os.path.join(pwd, 'library'), os.path.join(pwd, 'library-asm')]
 
 
-def setMode(mode):
+def setMode(mode: str) -> None:
     global LEXER
 
     mode = mode.upper()
@@ -130,14 +134,17 @@ def setMode(mode):
         LEXER = zxbpplex.Lexer()
 
 
-def search_filename(fname, lineno, local_first):
+def search_filename(fname: str, lineno: int, local_first: bool) -> str:
     """ Search a filename into the list of the include path.
     If local_first is true, it will try first in the current directory of
     the file being analyzed.
     """
     fname = src.api.utils.sanitize_filename(fname)
-    i_path = [CURRENT_DIR] + INCLUDEPATH if local_first else list(INCLUDEPATH)
+
+    assert CURRENT_DIR is not None
+    i_path: List[str] = [CURRENT_DIR] + INCLUDEPATH if local_first else list(INCLUDEPATH)
     i_path.extend(OPTIONS.include_path.split(':') if OPTIONS.include_path else [])
+
     if os.path.isabs(fname):
         if os.path.isfile(fname):
             return fname
@@ -151,7 +158,7 @@ def search_filename(fname, lineno, local_first):
     return ''
 
 
-def include_file(filename, lineno, local_first):
+def include_file(filename: str, lineno: int, local_first: bool) -> str:
     """ Performs a file inclusion (#include) in the preprocessor.
     Writes down that "filename" was included at the current file,
     at line <lineno>.
@@ -174,7 +181,7 @@ def include_file(filename, lineno, local_first):
     return LEXER.include(filename)
 
 
-def include_once(filename, lineno, local_first):
+def include_once(filename: str, lineno: int, local_first: bool) -> str:
     """ Performs a file inclusion (#include) in the preprocessor.
     Writes down that "filename" was included at the current file,
     at line <lineno>.
@@ -201,6 +208,20 @@ def include_once(filename, lineno, local_first):
     return ''
 
 
+def expand_macros(macros: List[Any], lineno: int) -> Optional[str]:
+    try:
+        tmp = ''.join(remove_spaces(str(x())) if isinstance(x, MacroCall) else x for x in macros)
+    except PreprocError as v:
+        error(v.lineno, v.message)
+        return None
+
+    if '\n' in tmp:
+        tmp += f'\n#line {lineno + 1}'
+    tmp += '\n'
+
+    return tmp
+
+
 # -------- GRAMMAR RULES for the preprocessor ---------
 def p_start(p):
     """ start : program
@@ -227,15 +248,12 @@ def p_program(p):
 def p_program_tokenstring(p):
     """ program : defs NEWLINE
     """
-    try:
-        tmp = [remove_spaces(str(x())) if isinstance(x, MacroCall) else x for x in p[1]]
-    except PreprocError as v:
-        error(v.lineno, v.message)
+    tmp = expand_macros(p[1], p.lineno(2))
+    if tmp is None:
         p[0] = []
         return
 
-    tmp.append(p[2])
-    p[0] = tmp
+    p[0] = [tmp]
 
 
 def p_program_tokenstring_2(p):
@@ -261,22 +279,19 @@ def p_program_char(p):
 def p_program_newline(p):
     """ program : program defs NEWLINE
     """
-    try:
-        tmp = [remove_spaces(str(x())) if isinstance(x, MacroCall) else x for x in p[2]]
-    except PreprocError as v:
-        error(v.lineno, v.message)
+    tmp = expand_macros(p[2], p.lineno(3))
+    if tmp is None:
         p[0] = []
         return
 
     p[0] = p[1]
-    p[0].extend(tmp)
-    p[0].append(p[3])
+    p[0].append(tmp)
 
 
 def p_program_newline_2(p):
     """ program : program define NEWLINE
     """
-    p[0] = p[1] + p[2] + [p[3]]
+    p[0] = p[1] + [f'#line {p.lineno(3) + 1} "{output.CURRENT_FILE[-1]}"\n']
 
 
 def p_token(p):

src/parsetab/tabs.dbm.bak

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

src/parsetab/tabs.dbm.dat

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

src/parsetab/tabs.dbm.dir

@@ -4,8 +4,7 @@
 ASM 
 
         LD A,A 
-        LD BC,254 
-#line 6
-
+        LD BC,254
+#line 7
 end Asm
 

tests/functional/emook0.out

@@ -0,0 +1,12 @@
+
+#define BORDE(x) \
+	asm \
+		ld a,x \
+		out (254),a \
+	end asm
+
+DIM a
+
+BORDE(5): a = 1
+a+
+

tests/functional/line_number_after_macro.bas

@@ -11,7 +11,7 @@
 
 
 
-
+#line 13 "/zxbasic/src/arch/zx48k/library/attr.bas"
 
 #pragma push(case_insensitive)
 #pragma case_insensitive = TRUE