Skip to content

Bugfix/token error in asm #415

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 2 commits into from
Dec 8, 2020
Merged

Bugfix/token error in asm #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25f74fd
Allow chars { and } in ASM context
boriel Dec 6, 2020
e67dc89
Add tests
boriel Dec 8, 2020
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
2 changes: 1 addition & 1 deletion src/libzxbpp/zxbasmpplex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ def t_INITIAL_CHAR(self, t):
return t

def t_INITIAL_TOKEN(self, t):
r"[][%'`,.:$()*/<>~&|+^-]"
r"[][}{%'`,.:$()*/<>~&|+^-]"
return t

def t_prepro_define_defargs_defargsopt_defexpr_pragma_NEWLINE(self, t):
Expand Down
2 changes: 1 addition & 1 deletion src/libzxbpp/zxbpplex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def t_asm_CHAR(self, t):
return t

def t_asm_TOKEN(self, t):
r"[]['`.:$*/+<>|&~%^-]"
r"[][}{'`.:$*/+<>|&~%^-]"
return t

def t_INITIAL_CONTINUE(self, t):
Expand Down
40 changes: 40 additions & 0 deletions tests/functional/asm_tokens.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
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 0
ld a, {{macro_value}}
#line 1
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
4 changes: 4 additions & 0 deletions tests/functional/asm_tokens.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
asm
ld a, {{macro_value}}
end asm