Skip to content

fix: add missing parse rule in assembler #1077

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

Open
boriel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add missing parse rule in assembler #1077

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
624 changes: 336 additions & 288 deletions poetry.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/api/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@


SHELVE_PATH = os.path.join(constants.ZXBASIC_ROOT, "parsetab", "tabs.dbm")
SHELVE = shelve.open(SHELVE_PATH)
SHELVE = shelve.open(SHELVE_PATH, protocol=5, flag="c")

T = TypeVar("T")

Expand Down Expand Up @@ -178,7 +178,7 @@ def eval_to_num(expr: str) -> int | float | None:
except (NameError, SyntaxError, ValueError):
return None

if isinstance(result, (int, float)):
if isinstance(result, int | float):
return result

return None
Expand Down
6 changes: 3 additions & 3 deletions src/parsetab/tabs.dbm.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
'zxbpp', (0, 71563)
'asmparse', (71680, 233956)
'zxnext_asmparse', (305664, 259034)
'zxbparser', (564736, 641214)
'asmparse', (71680, 234798)
'zxnext_asmparse', (306688, 259879)
'zxbparser', (566784, 641214)
Binary file modified src/parsetab/tabs.dbm.dat
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions src/parsetab/tabs.dbm.dir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
'zxbpp', (0, 71563)
'asmparse', (71680, 233956)
'zxnext_asmparse', (305664, 259034)
'zxbparser', (564736, 641214)
'asmparse', (71680, 234798)
'zxnext_asmparse', (306688, 259879)
'zxbparser', (566784, 641214)
4 changes: 3 additions & 1 deletion src/zxbasm/asmparse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,9 @@ def p_expr_div_expr(p):


def p_expr_lprp(p):
"""pexpr : LP expr RP"""
"""pexpr : LP expr RP
| LP pexpr RP
"""
p[0] = p[2]


Expand Down
5 changes: 5 additions & 0 deletions tests/functional/asm/ld_hl_expr.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ld hl, (_Fuente.__DATA__ + 0) - (256)
ld hl, ((_Fuente.__DATA__ + 0)) - (256)
ld hl, ((_Fuente.__DATA__ + 0) - (256))

_Fuente.__DATA__:
1 change: 1 addition & 0 deletions tests/functional/asm/ld_hl_expr.bin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
! ÿ! ÿ* ÿ
Loading