Merge pull request boriel-basic#606 from boriel/bugfix/allow_case_ins…

…ensitive_directivez_in_preproc

fix: allow case-insensitive preproc directives

src/parsetab/tabs.dbm.bak

@@ -1,4 +1,4 @@
-'zxbpp', (0, 67001)
+'zxbpp', (0, 66998)
 'asmparse', (67072, 220672)
 'zxnext_asmparse', (287744, 245099)
 'zxbparser', (532992, 641182)

src/parsetab/tabs.dbm.dir

@@ -1,4 +1,4 @@
-'zxbpp', (0, 67001)
+'zxbpp', (0, 66998)
 'asmparse', (67072, 220672)
 'zxnext_asmparse', (287744, 245099)
 'zxbparser', (532992, 641182)

src/zxbpp/zxbasmpplex.py

@@ -183,7 +183,7 @@ def t_if_OR(self, t):
 
     def t_prepro_ID(self, t):
         r"[._a-zA-Z][._a-zA-Z0-9]*"  # preprocessor directives
-        t.type = self.reserved_directives.get(t.value, "ID")
+        t.type = self.reserved_directives.get(t.value.lower(), "ID")
         states_ = {"DEFINE": "define", "ERROR": "msg", "IF": "if", "LINE": "line", "PRAGMA": "pragma", "WARNING": "msg"}
 
         if t.type in states_:

src/zxbpp/zxbpp.py

@@ -102,7 +102,8 @@ class IncludedFileInfo:
 
 precedence = (
     ("nonassoc", "DUMMY"),
-    ("left", "AND", "OR"),
+    ("left", "OR"),
+    ("left", "AND"),
     ("left", "EQ", "NE", "LT", "LE", "GT", "GE"),
     ("right", "LLP"),
     ("left", "PASTE", "STRINGIZING"),
@@ -262,6 +263,22 @@ def expand_macros(macros: List[Any], lineno: int) -> Optional[str]:
     return tmp
 
 
+def to_bool(expr: Union[str, bool, int]) -> int:
+    if isinstance(expr, str) and expr.isdigit():
+        expr = int(expr)
+
+    return int(bool(expr))
+
+
+def to_int(expr: Union[str, int]) -> int:
+    if isinstance(expr, str) and expr.isdigit():
+        expr = int(expr)
+    else:
+        expr = 0
+
+    return expr
+
+
 # -------- GRAMMAR RULES for the preprocessor ---------
 def p_start(p):
     """start : program"""
@@ -655,12 +672,12 @@ def p_expr_str(p):
 
 def p_exprand(p):
     """expr : expr AND expr"""
-    p[0] = "1" if p[1] and p[3] else "0"
+    p[0] = "1" if to_bool(p[1]) and to_bool(p[3]) else "0"
 
 
 def p_expror(p):
     """expr : expr OR expr"""
-    p[0] = "1" if p[1] or p[3] else "0"
+    p[0] = "1" if to_bool(p[1]) or to_bool(p[3]) else "0"
 
 
 def p_exprne(p):
@@ -675,34 +692,22 @@ def p_expreq(p):
 
 def p_exprlt(p):
     """expr : expr LT expr"""
-    a = int(p[1]) if p[1].isdigit() else 0
-    b = int(p[3]) if p[3].isdigit() else 0
-
-    p[0] = "1" if a < b else "0"
+    p[0] = "1" if to_int(p[1]) < to_int(p[3]) else "0"
 
 
 def p_exprle(p):
     """expr : expr LE expr"""
-    a = int(p[1]) if p[1].isdigit() else 0
-    b = int(p[3]) if p[3].isdigit() else 0
-
-    p[0] = "1" if a <= b else "0"
+    p[0] = "1" if to_int(p[1]) <= to_int(p[3]) else "0"
 
 
 def p_exprgt(p):
     """expr : expr GT expr"""
-    a = int(p[1]) if p[1].isdigit() else 0
-    b = int(p[3]) if p[3].isdigit() else 0
-
-    p[0] = "1" if a > b else "0"
+    p[0] = "1" if to_int(p[1]) > to_int(p[3]) else "0"
 
 
 def p_exprge(p):
     """expr : expr GE expr"""
-    a = int(p[1]) if p[1].isdigit() else 0
-    b = int(p[3]) if p[3].isdigit() else 0
-
-    p[0] = "1" if a >= b else "0"
+    p[0] = "1" if to_int(p[1]) >= to_int(p[3]) else "0"
 
 
 def p_expr_par(p):

src/zxbpp/zxbpplex.py

@@ -236,7 +236,7 @@ def t_if_OR(self, t):
 
     def t_prepro_ID(self, t):
         r"[._a-zA-Z][._a-zA-Z0-9]*"  # preprocessor directives
-        t.type = self.reserved_directives.get(t.value, "ID")
+        t.type = self.reserved_directives.get(t.value.lower(), "ID")
         states_ = {"DEFINE": "define", "ERROR": "msg", "IF": "if", "LINE": "line", "PRAGMA": "pragma", "WARNING": "msg"}
 
         if t.type in states_:

tests/functional/iflogic.bi

@@ -13,3 +13,7 @@ PRINT "And works"
 #if (A == 1 && B == 1) || B == 2
 PRINT "Parenthesis works"
 #endif
+
+#if A == 1 && B != 2
+PRINT "this should not happen!"
+#endif

tests/functional/iflogic.out

@@ -14,3 +14,5 @@ PRINT "And works"
 
 PRINT "Parenthesis works"
 #line 16 "iflogic.bi"
+
+#line 20 "iflogic.bi"

tests/functional/zx48k/spfill.bas

@@ -2,7 +2,7 @@
 ' (c)2002(?) by Alvin Albretch
 ' Ported to ZX Basic by Paul Fisher (Britlion)
 
-#include <SP/Fill.bas>
+#Include <SP/Fill.bas>
 
 10 CLS
 20 CIRCLE 128, 87, 87