Merge pull request boriel-basic#570 from boriel/bugfix/error_line_num…

…bers fix: fix error line number in macros in ASM
boriel · Sep 29, 2021 · 58608ca · 58608ca
2 parents 47d5624 + 14fa218
commit 58608ca
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 20 deletions.
diff --git a/src/parsetab/tabs.dbm.bak b/src/parsetab/tabs.dbm.bak
@@ -1,4 +1,4 @@
 'zxbpp', (0, 76970)
-'asmparse', (77312, 272467)
-'zxnext_asmparse', (350208, 303081)
-'zxbparser', (653312, 703160)
+'asmparse', (77312, 268394)
+'zxnext_asmparse', (346112, 298411)
+'zxbparser', (644608, 703160)
diff --git a/src/parsetab/tabs.dbm.dat b/src/parsetab/tabs.dbm.dat
diff --git a/src/parsetab/tabs.dbm.dir b/src/parsetab/tabs.dbm.dir
@@ -1,4 +1,4 @@
 'zxbpp', (0, 76970)
-'asmparse', (77312, 272467)
-'zxnext_asmparse', (350208, 303081)
-'zxbparser', (653312, 703160)
+'asmparse', (77312, 268394)
+'zxnext_asmparse', (346112, 298411)
+'zxbparser', (644608, 703160)
diff --git a/src/zxbasm/asmlex.py b/src/zxbasm/asmlex.py
@@ -18,6 +18,8 @@
 from src.api.config import OPTIONS
 from src.api.errmsg import error
 
+from src.api import global_
+
 
 _tokens: Tuple[str, ...] = (
     "STRING",
@@ -192,7 +194,7 @@
     "m": "M",
 }
 
-preprocessor = {"init": "_INIT", "line": "_LINE"}
+preprocessor = {"init": "_INIT"}
 
 # List of token names.
 _tokens = tuple(
@@ -336,6 +338,14 @@ def t_INITIAL_ID(self, t):
 
         return t
 
+    def t_asm_PREPROCLINE(self, t):
+        r'\#[ \t]*[Ll][Ii][Nn][Ee][ \t]+([0-9]+)(?:[ \t]+"((?:[^"]|"")*)")?[ \t]*\r?\n'
+        import re
+
+        match = re.match('#[ \t]*[Ll][Ii][Nn][Ee][ \t]+([0-9]+)(?:[ \t]+"((?:[^"]|"")*)")?[ \t]*\r?\n', t.value)
+        global_.FILENAME = match.groups()[1] or global_.FILENAME
+        self.lineno = int(match.groups()[0])
+
     def t_preproc_ID(self, t):
         r"[_a-zA-Z][_a-zA-Z0-9]*"  # preprocessor directives
         t.type = preprocessor.get(t.value.lower(), "ID")

diff --git a/src/zxbasm/asmparse.py b/src/zxbasm/asmparse.py
@@ -926,17 +926,6 @@ def p_preprocessor_line(p):
     p[0] = None
 
 
-def p_preprocessor_line_line(p):
-    """preproc_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 INTEGER STRING"""
-    p.lexer.lineno = int(p[2]) + p.lexer.lineno - p.lineno(3) - 1
-    gl.FILENAME = p[3]
-
-
 def p_preproc_line_init(p):
     """preproc_line : _INIT STRING"""
     INITS.append(Container(p[2].strip('"'), p.lineno(2)))

diff --git a/tests/functional/test_errmsg.txt b/tests/functional/test_errmsg.txt
@@ -225,8 +225,10 @@ line_number_after_macro.bas:11: error: Syntax Error. Unexpected token '+' <PLUS>
 >>> process_file('zx48k/tap_asm_error_line.bas', ['-S', '-q'])
 tap_asm_error_line.bas:3: error: Syntax error. Unexpected token '10' [INTEGER]
 tap_asm_error_line.bas:7: error: Syntax error. Unexpected token '10' [INTEGER]
->>> process_file('zx48k/tap_errline.bas')
-tap_errline.bas:10: error: Syntax error. Unexpected token 'HL' [HL]
+>>> process_file('zx48k/tap_errline0.bas')
+tap_errline0.bas:10: error: Syntax error. Unexpected token 'HL' [HL]
+>>> process_file('zx48k/tap_errline1.bas')
+tap_errline1.bas:15: error: Syntax error. Unexpected token 'HL' [HL]
 
 # Test error file names
 >>> process_file('zx48k/bad_fname_err0.bas', ['-S', '-q'])

diff --git a/tests/functional/zx48k/tap_errline.bas → tests/functional/zx48k/tap_errline0.bas b/tests/functional/zx48k/tap_errline.bas → tests/functional/zx48k/tap_errline0.bas
diff --git a/tests/functional/zx48k/tap_errline1.bas b/tests/functional/zx48k/tap_errline1.bas
@@ -0,0 +1,20 @@
+border 0
+
+#define BREAK \
+   nop \
+
+asm
+    BREAK
+    push    hl
+    push    de
+    push    af
+
+    ld      hl,16384
+    ld      de,16385
+    ld      a,(hl)
+    ex      hl,de
+
+    pop     af
+    pop     de
+    pop     hl
+end asm