Merge pull request #455 from boriel/bugfix/ASM_line_fix

Fix linenumbering offset in asm contexts

Author: boriel

src/arch/zx48k/translator.py

@@ -907,9 +907,9 @@ def visit_ITALIC(self, node):
     # -----------------------------------------------------------------------------------------------------
     def visit_ASM(self, node):
         EOL = '\n'
-        self.ic_inline(f'#line {node.lineno} "{node.filename}"')
+        self.ic_inline(f'#line {node.lineno + 1} "{node.filename}"')
         self.ic_inline(node.asm)
-        self.ic_inline(f'#line {node.lineno + 1 + len(node.asm.split(EOL))} "{node.filename}"')
+        self.ic_inline(f'#line {node.lineno + len(node.asm.split(EOL))} "{node.filename}"')
 
     # endregion
 

tests/functional/test_cmdline.txt

@@ -37,7 +37,6 @@ no_zxnext.asm:29: error: Syntax error. Unexpected token 'C' [C]
 define_val.bas:4: error: "MACRO should be VALUE"
 
 >>> process_file('tap_include_asm_error.bas', ['-q', '-S'])
-extra_chars.bas:2: error: illegal character '`'
-extra_chars.bas:3: error: illegal character '#'
-
+extra_chars.bas:3: error: illegal character '`'
+extra_chars.bas:4: error: illegal character '#'
 

tests/functional/test_errmsg.txt

@@ -195,6 +195,6 @@ doloop2.bas:4: warning: [W150] Variable 'a' is never used
 line_number_after_macro.bas:8: warning: Using default implicit type 'float' for 'a'
 line_number_after_macro.bas:11: error: Syntax Error. Unexpected token '+' <PLUS>
 >>> process_file('tap_asm_error_line.bas', ['-S', '-q'])
-tap_asm_error_line.bas:2: error: Syntax error. Unexpected token '10' [INTEGER]
-tap_asm_error_line.bas:6: error: Syntax error. Unexpected token '10' [INTEGER]
+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]