Merge pull request #446 from boriel/bugfix/missing_include_filename

Bugfix/missing include filename

Author: boriel

src/arch/zx48k/backend/__init__.py

@@ -1803,9 +1803,7 @@ def _inline(ins):
 
     ASMLABEL = new_ASMID()
     ASMS[ASMLABEL] = tmp
-    output.append('#line %s' % ins.quad[2])
     output.append(ASMLABEL)
-    output.append('#line %i' % (int(ins.quad[2]) + len(tmp)))
 
     return output
 
@@ -2095,7 +2093,7 @@ def __str__(self):
     'out': [2, _out],  # Defines a OUT instruction OUT x, y
     'in': [1, _in],  # Defines an IN instruction IN x, y
 
-    'inline': [2, _inline],  # Defines an inline asm instruction
+    'inline': [1, _inline],  # Defines an inline asm instruction
 
     'cast': [4, _cast],
     # TYPECAST: X = cast(from Type1, to Type2, Y) Ej. Converts Y 16bit to X 8bit: (cast, x, u16, u8, y)

src/arch/zx48k/translator.py

@@ -626,7 +626,7 @@ def visit_ON_GOSUB(self, node):
 
     def visit_CHKBREAK(self, node):
         if self.PREV_TOKEN != node.token:
-            self.ic_inline('push hl', node.children[0].t)
+            self.ic_inline('push hl')
             self.ic_fparam(gl.PTR_TYPE, node.children[0].t)
             self.ic_call('CHECK_BREAK', 0)
             backend.REQUIRES.add('break.asm')
@@ -906,7 +906,10 @@ def visit_ITALIC(self, node):
     # Other Sentences, like ASM, etc..
     # -----------------------------------------------------------------------------------------------------
     def visit_ASM(self, node):
-        self.ic_inline(node.asm, node.lineno)
+        EOL = '\n'
+        self.ic_inline(f'#line {node.lineno} "{node.filename}"')
+        self.ic_inline(node.asm)
+        self.ic_inline(f'#line {node.lineno + 1 + len(node.asm.split(EOL))} "{node.filename}"')
 
     # endregion
 

src/arch/zx48k/translatorinstvisitor.py

@@ -109,8 +109,8 @@ def ic_gt(self, type_, t, t1, t2):
     def ic_in(self, t):
         return self.emit('in', t)
 
-    def ic_inline(self, asm_code: str, t):
-        return self.emit('inline', asm_code, t)
+    def ic_inline(self, asm_code: str):
+        return self.emit('inline', asm_code)
 
     def ic_jgezero(self, type_, t, label: str):
         return self.emit('jgezero' + self.TSUFFIX(type_), t, label)

src/arch/zx48k/translatorvisitor.py

@@ -199,25 +199,20 @@ def traverse_const(node):
             return result
 
         if node.token == 'BINARY':
-            mid = node.operator
-            if mid == 'PLUS':
-                mid = '+'
-            elif mid == 'MINUS':
-                mid = '-'
-            elif mid == 'MUL':
-                mid = '*'
-            elif mid == 'DIV':
-                mid = '/'
-            elif mid == 'MOD':
-                mid = '%'
-            elif mid == 'POW':
-                mid = '^'
-            elif mid == 'SHL':
-                mid = '>>'
-            elif mid == 'SHR':
-                mid = '<<'
-            else:
-                raise InvalidOperatorError(mid)
+            operator = {
+                'PLUS': '+',
+                'MINUS': '-',
+                'MUL': '*',
+                'DIV': '/',
+                'MOD': '%',
+                'POW': '^',
+                'SHL': '>>',
+                'SHR': '<<'
+            }
+
+            mid = operator.get(node.operator)
+            if mid is None:
+                raise InvalidOperatorError(node.operator)
 
             return '(%s) %s (%s)' % (TranslatorVisitor.traverse_const(node.left), mid,
                                      TranslatorVisitor.traverse_const(node.right))

src/libzxbc/zxbc.py

@@ -252,7 +252,7 @@ def main(args=None, emitter=None):
     # Emits jump tables
     translator.emit_jump_tables()
     # Signals end of user code
-    translator.ic_inline(';; --- end of user code ---', zxblex.lexer.lineno)
+    translator.ic_inline(';; --- end of user code ---')
 
     if OPTIONS.emitBackend:
         with open_file(OPTIONS.outputFileName, 'wt', 'utf-8') as output_file:

tests/functional/tap_include_asm_error.bas

@@ -0,0 +1,2 @@
+#include "extra_chars.bas"
+

tests/functional/test_cmdline.txt

@@ -36,3 +36,7 @@ no_zxnext.asm:29: error: Syntax error. Unexpected token 'C' [C]
 >>> process_file('define_val.bas', ['-q', '-S', '-O -D MACRO'])
 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 '#'
+