Merge pull request #587 from boriel/bugfix/asm_db_multiple

boriel · web-flow · commit e9d6637475b5 · 2021-11-15T23:58:08.000+01:00
fix: fixes DB expr syn rule in ASM
diff --git a/src/parsetab/tabs.dbm.bak b/src/parsetab/tabs.dbm.bak
@@ -1,4 +1,4 @@
 'zxbpp', (0, 76970)
-'asmparse', (77312, 268610)
-'zxnext_asmparse', (346112, 298625)
-'zxbparser', (645120, 708977)
+'asmparse', (77312, 269087)
+'zxnext_asmparse', (346624, 299111)
+'zxbparser', (646144, 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, 268610)
-'zxnext_asmparse', (346112, 298625)
-'zxbparser', (645120, 708977)
+'asmparse', (77312, 269087)
+'zxnext_asmparse', (346624, 299111)
+'zxbparser', (646144, 708977)
diff --git a/src/zxbasm/asmparse.py b/src/zxbasm/asmparse.py
@@ -211,9 +211,7 @@ def p_idlist_id(p):
 
 
 def p_DEFB(p):  # Define bytes
-    """asm : DEFB expr_list
-    | DEFB number_list
-    """
+    """asm : DEFB expr_list"""
     p[0] = Asm(p.lineno(1), "DEFB", p[2])
 
 
@@ -239,6 +237,13 @@ def p_expr_list_from_string(p):
     p[0] = tuple(Expr.makenode(Container(ord(x), p.lineno(1))) for x in p[1])
 
 
+def p_expr_list_from_num(p):
+    """expr_list : expr
+    | pexpr
+    """
+    p[0] = (p[1],)
+
+
 def p_expr_list_plus_expr(p):
     """expr_list : expr_list COMMA expr
     | expr_list COMMA pexpr
diff --git a/tests/functional/db_multi.asm b/tests/functional/db_multi.asm
@@ -1,3 +1,3 @@
 
 DB "Hello", 32, "Worl", 'D' + 32
-
+DB 32, "Hello"
diff --git a/tests/functional/db_multi.bin b/tests/functional/db_multi.bin
@@ -1 +1 @@
-Hello World
+Hello World Hello

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`
`2`	`2`	`DB "Hello", 32, "Worl", 'D' + 32`
`3`		`-`
	`3`	`+DB 32, "Hello"`