Merge pull request #591 from boriel/bugfix/asm_negative_parenthesis_expr

fix: fix assembler expr parsing for -(expr)
boriel-basic · Nov 28, 2021 · 2794fd2 · 2794fd2
2 parents cf504fb + e25ef4a
commit 2794fd2
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/src/parsetab/tabs.dbm.bak b/src/parsetab/tabs.dbm.bak
@@ -1,4 +1,4 @@
 'zxbpp', (0, 76970)
-'asmparse', (77312, 269087)
-'zxnext_asmparse', (346624, 299111)
-'zxbparser', (646144, 708977)
+'asmparse', (77312, 270618)
+'zxnext_asmparse', (348160, 300642)
+'zxbparser', (649216, 708977)
diff --git a/src/parsetab/tabs.dbm.dat b/src/parsetab/tabs.dbm.dat
diff --git a/src/parsetab/tabs.dbm.dir b/src/parsetab/tabs.dbm.dir
@@ -1,4 +1,4 @@
 'zxbpp', (0, 76970)
-'asmparse', (77312, 269087)
-'zxnext_asmparse', (346624, 299111)
-'zxbparser', (646144, 708977)
+'asmparse', (77312, 270618)
+'zxnext_asmparse', (348160, 300642)
+'zxbparser', (649216, 708977)
diff --git a/src/zxbasm/asmparse.py b/src/zxbasm/asmparse.py
@@ -900,6 +900,8 @@ def p_mem_indir(p):
 def p_expr_uminus(p):
     """expr : MINUS expr %prec UMINUS
     | PLUS expr %prec UMINUS
+    | MINUS pexpr %prec UMINUS
+    | PLUS pexpr %prec UMINUS
     """
     p[0] = Expr.makenode(Container(p[1], p.lineno(1)), p[2])
 

diff --git a/tests/functional/neg_par.asm b/tests/functional/neg_par.asm
@@ -0,0 +1,4 @@
+ld a, -(5)
+ld a, 0-(5)
+ld a, +(5)
+ld a, 0+(5)
diff --git a/tests/functional/neg_par.bin b/tests/functional/neg_par.bin
@@ -0,0 +1 @@
+>�>�>>