fix: add missing parse rule in assembler

boriel · boriel · commit bbe6a4bebcba · 2026-05-07T07:40:51.000+02:00
diff --git a/poetry.lock b/poetry.lock
diff --git a/src/api/utils.py b/src/api/utils.py
@@ -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")
 
@@ -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
diff --git a/src/parsetab/tabs.dbm.bak b/src/parsetab/tabs.dbm.bak
@@ -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)
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, 71563)
-'asmparse', (71680, 233956)
-'zxnext_asmparse', (305664, 259034)
-'zxbparser', (564736, 641214)
+'asmparse', (71680, 234798)
+'zxnext_asmparse', (306688, 259879)
+'zxbparser', (566784, 641214)
diff --git a/src/zxbasm/asmparse.py b/src/zxbasm/asmparse.py
@@ -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]
 
 
diff --git a/tests/functional/asm/ld_hl_expr.asm b/tests/functional/asm/ld_hl_expr.asm
@@ -0,0 +1,5 @@
+ld hl, (_Fuente.__DATA__ + 0) - (256)
+ld hl, ((_Fuente.__DATA__ + 0)) - (256)
+ld hl, ((_Fuente.__DATA__ + 0) - (256))
+
+_Fuente.__DATA__:
diff --git a/tests/functional/asm/ld_hl_expr.bin b/tests/functional/asm/ld_hl_expr.bin
@@ -0,0 +1 @@
+!	�!	�*	�
