Fix wrong line number within asm context

Author: boriel

src/arch/zx48k/backend/__init__.py

@@ -1767,7 +1767,7 @@ def _memcopy(ins):
 def _inline(ins):
     """ Inline code
     """
-    tmp = [x.strip(' \t\r\n') for x in ins.quad[1].split('\n')]  # Split lines
+    tmp = [x.strip(' \t\r') for x in ins.quad[1].split('\n')]  # Split lines
 
     i = 0
     while i < len(tmp):
@@ -1789,12 +1789,7 @@ def _inline(ins):
             i += 1
             continue
 
-        if len(tmp[i][-1]) == ':':
-            i += 1
-            continue  # This is already a single label
-
-        tmp[i] = tmp[i][match.end() + 1:].strip(' \n')
-        tmp.insert(i, match.group())
+        # It starts with a label. Do not tabulate
         i += 1
 
     output = []

src/libzxbc/zxblex.py

@@ -415,7 +415,7 @@ def t_asm_ASM(t):
 
     t.lexer.begin('INITIAL')
     t.value = ASM
-    t.lineno = ASMLINENO - 1
+    t.lineno = ASMLINENO
     IN_STATE = False
 
     return t

tests/functional/asm_error_line.asm

@@ -0,0 +1,44 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+	jp __MAIN_PROGRAM__
+ZXBASIC_USER_DATA:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	.__LABEL__.ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_LEN
+	.__LABEL__.ZXBASIC_USER_DATA EQU ZXBASIC_USER_DATA
+ZXBASIC_USER_DATA_END:
+__MAIN_PROGRAM__:
+#line 2 "asm_error_line.bas"
+test: dk 10, 20
+#line 6 "asm_error_line.bas"
+#line 6 "asm_error_line.bas"
+		dk 10, 20
+#line 10 "asm_error_line.bas"
+	ld hl, 0
+	ld b, h
+	ld c, l
+__END_PROGRAM:
+	di
+	ld hl, (__CALL_BACK__)
+	ld sp, hl
+	exx
+	pop hl
+	exx
+	pop iy
+	pop ix
+	ei
+	ret
+__CALL_BACK__:
+	DEFW 0
+	;; --- end of user code ---
+	END

tests/functional/asm_error_line.bas

@@ -0,0 +1,9 @@
+
+ASM
+test: dk 10, 20
+END ASM
+
+ASM
+dk 10, 20
+END ASM
+

tests/functional/tap_asm_error_line.bas

@@ -0,0 +1,9 @@
+
+ASM
+test: dk 10, 20
+END ASM
+
+ASM
+dk 10, 20
+END ASM
+

tests/functional/test_cmdline.txt

@@ -37,6 +37,7 @@ 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:1: error: illegal character '`'
-extra_chars.bas:2: error: illegal character '#'
+extra_chars.bas:2: error: illegal character '`'
+extra_chars.bas:3: error: illegal character '#'
+
 

tests/functional/test_errmsg.txt

@@ -194,4 +194,7 @@ doloop2.bas:4: warning: [W150] Variable 'a' is never used
 >>> process_file('line_number_after_macro.bas')
 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]