Merge pull request #322 from boriel/bugfix/Command_line_define_values_ignored

boriel · web-flow · commit 9c473b2061b9 · 2020-05-27T01:09:58.000+02:00
Bugfix/command line define values ignored
diff --git a/tests/functional/define_val.asm b/tests/functional/define_val.asm
@@ -0,0 +1,34 @@
+	org 32768
+__START_PROGRAM:
+	di
+	push ix
+	push iy
+	exx
+	push hl
+	exx
+	ld hl, 0
+	add hl, sp
+	ld (__CALL_BACK__), hl
+	ei
+	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
+ZXBASIC_USER_DATA:
+; Defines DATA END --> HEAP size is 0
+ZXBASIC_USER_DATA_END:
+	; Defines USER DATA Length in bytes
+ZXBASIC_USER_DATA_LEN EQU ZXBASIC_USER_DATA_END - ZXBASIC_USER_DATA
+	END
diff --git a/tests/functional/define_val.bas b/tests/functional/define_val.bas
@@ -0,0 +1,8 @@
+
+#ifdef MACRO
+#  if MACRO != VALUE
+#    error "MACRO should be VALUE"
+#  endif
+#endif
+
+
diff --git a/tests/functional/prepro91.bi b/tests/functional/prepro91.bi
@@ -0,0 +1,9 @@
+
+#ifdef MACRO
+# if MACRO != VALUE
+   WRONG
+# endif
+#else
+   OK
+#endif
+
diff --git a/tests/functional/prepro91.out b/tests/functional/prepro91.out
@@ -0,0 +1,4 @@
+#line 1 "prepro91.bi"
+#line 7 "prepro91.bi"
+   OK
+#line 9 "prepro91.bi"
diff --git a/tests/functional/prepro92.bi b/tests/functional/prepro92.bi
@@ -0,0 +1,9 @@
+
+REM Checks -D MACRO=VALUE is defined correctly from zxbc commandline
+
+#ifdef MACRO
+#  error This should not happen
+#else
+OK
+#endif
+
diff --git a/tests/functional/prepro92.out b/tests/functional/prepro92.out
@@ -0,0 +1,4 @@
+#line 1 "prepro92.bi"
+#line 7 "prepro92.bi"
+OK
+#line 9 "prepro92.bi"
diff --git a/tests/functional/prepro93.bi b/tests/functional/prepro93.bi
@@ -0,0 +1,11 @@
+
+REM Checks -D MACRO=VALUE is defined correctly from zxbc commandline
+
+#ifdef MACRO
+#  if MACRO != VALUE
+#    error This should not happen
+#  endif
+#else
+OK
+#endif
+
diff --git a/tests/functional/prepro93.out b/tests/functional/prepro93.out
@@ -0,0 +1,4 @@
+#line 1 "prepro93.bi"
+#line 9 "prepro93.bi"
+OK
+#line 11 "prepro93.bi"
diff --git a/tests/functional/prepro94.bi b/tests/functional/prepro94.bi
@@ -0,0 +1,9 @@
+
+
+#ifdef MACRO
+#  ifndef ANOTHER_MACRO
+#    error This should not happen
+#  endif
+#else
+  OK
+#endif
diff --git a/tests/functional/prepro94.out b/tests/functional/prepro94.out
@@ -0,0 +1,4 @@
+#line 1 "prepro94.bi"
+#line 8 "prepro94.bi"
+  OK
+#line 10 "prepro94.bi"
diff --git a/tests/functional/prepro95.bi b/tests/functional/prepro95.bi
@@ -0,0 +1,13 @@
+
+#ifdef MACRO
+#  define ANOTHER
+
+#  ifdef ANOTHER
+#    error This should never happen
+#  else
+#    error This should never happen
+#  endif
+#else
+ OK
+#endif
+
diff --git a/tests/functional/prepro95.out b/tests/functional/prepro95.out
@@ -0,0 +1,4 @@
+#line 1 "prepro95.bi"
+#line 11 "prepro95.bi"
+ OK
+#line 13 "prepro95.bi"
diff --git a/tests/functional/test_cmdline.txt b/tests/functional/test_cmdline.txt
@@ -30,3 +30,6 @@ no_zxnext.asm:29: Syntax error. Unexpected token 'C' [C]
 
 >>> process_file('zxnext_all.asm')
 
+>>> process_file('define_val.bas', ['-q', '-S', '-O -D MACRO=VALUE'])
+>>> process_file('define_val.bas', ['-q', '-S', '-O -D MACRO'])
+define_val.bas:4: Error: "MACRO should be VALUE"
diff --git a/zxb/zxb.py b/zxb/zxb.py
@@ -187,7 +187,7 @@ def main(args=None, emitter=None):
             name = macro[0]
             val = ''.join(macro[1:])
             OPTIONS.__DEFINES.value[name] = val
-            zxbpp.ID_TABLE.define(name, lineno=0)
+            zxbpp.ID_TABLE.define(name, value=val, lineno=0)
 
     if OPTIONS.Sinclair.value:
         OPTIONS.array_base.value = 1
diff --git a/zxbpp/zxbpp.py b/zxbpp/zxbpp.py
@@ -15,6 +15,7 @@
 import os
 import re
 import argparse
+from typing import NamedTuple, List
 
 from .zxbpplex import tokens  # noqa
 from . import zxbpplex, zxbasmpplex
@@ -45,10 +46,16 @@
 INCLUDEPATH = ('library', 'library-asm')
 
 # Enabled to FALSE if IFDEF failed
-ENABLED = True
+ENABLED: bool = True
+
+
+class IfDef(NamedTuple):
+    enabled: bool
+    line: int
+
 
 # IFDEFS array
-IFDEFS = []  # Push (Line, state here)
+IFDEFS: List[IfDef] = []  # Push (Line, state here)
 
 
 precedence = (
@@ -484,36 +491,37 @@ def p_ifdef(p):
 
     if ENABLED:
         p[0] = [p[2]] + p[3]
-        p[0] += ['#line %i "%s"' % (p.lineno(4) + 1, CURRENT_FILE[-1])]
     else:
-        p[0] = ['#line %i "%s"' % (p.lineno(4) + 1, CURRENT_FILE[-1])]
+        p[0] = []
 
-    ENABLED = IFDEFS[-1][0]
-    IFDEFS.pop()
+    p[0] += ['#line %i "%s"' % (p.lineno(4) + 1, CURRENT_FILE[-1])]
+    ENABLED = IFDEFS.pop().enabled
 
 
 def p_ifdef_else(p):
     """ ifdef : ifdefelsea ifdefelseb ENDIF
     """
     global ENABLED
 
-    p[0] = p[1] + p[2]
+    ENABLED = IFDEFS.pop().enabled
+    if ENABLED:
+        p[0] = p[1] + p[2]
+    else:
+        p[0] = []
+
     p[0] += ['#line %i "%s"' % (p.lineno(3) + 1, CURRENT_FILE[-1])]
-    ENABLED = IFDEFS[-1][0]
-    IFDEFS.pop()
 
 
 def p_ifdef_else_a(p):
     """ ifdefelsea : if_header NEWLINE program
     """
     global ENABLED
 
-    if ENABLED:
-        p[0] = [p[2]] + p[3]
-    else:
-        p[0] = []
-
-    ENABLED = not ENABLED
+    p[0] = []
+    if IFDEFS[-1].enabled:
+        if p[1]:
+            p[0] = [p[2]] + p[3]
+        ENABLED = not p[1]
 
 
 def p_ifdef_else_b(p):
@@ -533,26 +541,35 @@ def p_if_header(p):
     """
     global ENABLED
 
-    IFDEFS.append((ENABLED, p.lineno(2)))
-    ENABLED = ID_TABLE.defined(p[2])
+    IFDEFS.append(IfDef(ENABLED, p.lineno(2)))
+    if ENABLED:
+        ENABLED = ID_TABLE.defined(p[2])
+
+    p[0] = ENABLED
 
 
 def p_ifn_header(p):
     """ if_header : IFNDEF ID
     """
     global ENABLED
 
-    IFDEFS.append((ENABLED, p.lineno(2)))
-    ENABLED = not ID_TABLE.defined(p[2])
+    IFDEFS.append(IfDef(ENABLED, p.lineno(2)))
+    if ENABLED:
+        ENABLED = not ID_TABLE.defined(p[2])
+
+    p[0] = ENABLED
 
 
 def p_if_expr_header(p):
     """ if_header : IF expr
     """
     global ENABLED
 
-    IFDEFS.append((ENABLED, p.lineno(1)))
-    ENABLED = bool(int(p[2])) if p[2].isdigit() else ID_TABLE.defined(p[2])
+    IFDEFS.append(IfDef(ENABLED, p.lineno(2)))
+    if ENABLED:
+        ENABLED = bool(int(p[2])) if p[2].isdigit() else ID_TABLE.defined(p[2])
+
+    p[0] = ENABLED
 
 
 def p_expr(p):

-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
++
 +#ifdef MACRO
 +# if MACRO != VALUE
 +   WRONG
 +# endif
 +#else
 +   OK
 +#endif
++