Skip to content

Fix linenumbering offset in asm contexts #455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boriel merged 1 commit into from
Jan 12, 2021
Merged

Fix linenumbering offset in asm contexts #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/arch/zx48k/translator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 2 additions & 3 deletions tests/functional/test_cmdline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 '#'

4 changes: 2 additions & 2 deletions tests/functional/test_errmsg.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]