refact: allow numbers and strings in zxbpp #if exprs

Author: boriel

src/zxbpp/zxbasmpplex.py

@@ -34,13 +34,15 @@
     ("defargsopt", "exclusive"),
     ("defargs", "exclusive"),
     ("defexpr", "exclusive"),
+    ("msg", "exclusive"),
     ("pragma", "exclusive"),
     ("singlecomment", "exclusive"),
     ("asmcomment", "exclusive"),
 )
 
 _tokens = (
     "STRING",
+    "TEXT",
     "TOKEN",
     "NEWLINE",
     "_ENDFILE_",
@@ -169,6 +171,15 @@ def t_prepro_ID(self, t):
             t.lexer.begin("pragma")
         elif t.type == "LINE":
             t.lexer.begin("line")
+        elif t.type in ("ERROR", "WARNING"):
+            t.lexer.begin("msg")
+        return t
+
+    def t_msg_TEXT(self, t):
+        r".*\n"
+        t.lexer.lineno += 1
+        t.lexer.begin("INITIAL")
+        t.value = t.value.strip()  # remove newline and spaces
         return t
 
     def t_pragma_LP(self, t):
@@ -245,12 +256,7 @@ def t_prepro_pragma_INTEGER(self, t):
         r"[0-9]+"  # an integer number
         return t
 
-    def t_prepro_pragma_STRING(self, t):
-        r'"([^"]|"")*"'  # a doubled quoted string
-        t.value = t.value[1:-1]  # Remove quotes
-        return t
-
-    def t_defexpr_INITIAL_STRING(self, t):
+    def t_INITIAL_prepro_pragma_defexpr_STRING(self, t):
         r'"([^"]|"")*"'  # a doubled quoted string
         return t
 
@@ -317,7 +323,7 @@ def t_line_defargs_defargsopt_prepro_define_defexpr_pragma_singlecomment_INITIAL
         r"."
         self.error("illegal preprocessor character '%s'" % t.value[0])
 
-    def t_line_defargs_defargsopt_prepro_define_defexpr_pragma_singlecomment_INITIAL_asmcomment_error(self, t):
+    def t_line_msg_defargs_defargsopt_prepro_define_defexpr_pragma_singlecomment_INITIAL_asmcomment_error(self, t):
         """error handling rule. This should never happens!"""
         pass  # The lexer will raise an exception here. This is intended
 

src/zxbpp/zxbpp.py

@@ -364,15 +364,6 @@ def p_include_once_ok(p):
     CURRENT_DIR = os.path.dirname(output.CURRENT_FILE[-1])
 
 
-def p_include(p):
-    """include : INCLUDE STRING"""
-    if ENABLED:
-        p[0] = include_file(p[2], p.lineno(2), local_first=True)
-    else:
-        p[0] = []
-        p.lexer.next_token = "_ENDFILE_"
-
-
 def p_include_fname(p):
     """include : INCLUDE FILENAME"""
     if ENABLED:
@@ -401,7 +392,7 @@ def p_include_macro(p):
 def p_include_once(p):
     """include_once : INCLUDE ONCE STRING"""
     if ENABLED:
-        p[0] = include_once(p[3], p.lineno(3), local_first=True)
+        p[0] = include_once(p[3][1:-1], p.lineno(3), local_first=True)
     else:
         p[0] = []
 
@@ -440,16 +431,19 @@ def p_line_file(p):
 
 def p_require_file(p):
     """require : REQUIRE STRING NEWLINE"""
-    p[0] = ['#%s "%s"\n' % (p[1], utils.sanitize_filename(p[2]))]
+    p[0] = ["#%s %s\n" % (p[1], utils.sanitize_filename(p[2]))]
 
 
 def p_init(p):
-    """init : INIT ID NEWLINE
-    | INIT STRING NEWLINE
-    """
+    """init : INIT ID NEWLINE"""
     p[0] = ['#%s "%s"\n' % (p[1], p[2])]
 
 
+def p_init_str(p):
+    """init : INIT STRING NEWLINE"""
+    p[0] = ["#%s %s\n" % (p[1], p[2])]
+
+
 def p_undef(p):
     """undef : UNDEF ID"""
     if ENABLED:
@@ -459,14 +453,14 @@ def p_undef(p):
 
 
 def p_errormsg(p):
-    """errormsg : ERROR STRING"""
+    """errormsg : ERROR TEXT"""
     if ENABLED:
         error(p.lineno(1), p[2])
     p[0] = []
 
 
 def p_warningmsg(p):
-    """warningmsg : WARNING STRING"""
+    """warningmsg : WARNING TEXT"""
     if ENABLED:
         warning(p.lineno(1), p[2])
     p[0] = []
@@ -535,12 +529,16 @@ def p_pragma_id(p):
 
 def p_pragma_id_expr(p):
     """pragma : PRAGMA ID EQ ID
-    | PRAGMA ID EQ STRING
     | PRAGMA ID EQ INTEGER
     """
     p[0] = ["#%s %s %s %s" % (p[1], p[2], p[3], p[4])]
 
 
+def p_pragma_id_string(p):
+    """pragma : PRAGMA ID EQ STRING"""
+    p[0] = ["#%s %s %s %s" % (p[1], p[2], p[3], p[4][1:-1])]
+
+
 def p_pragma_push(p):
     """pragma : PRAGMA PUSH LP ID RP
     | PRAGMA POP LP ID RP
@@ -644,6 +642,16 @@ def p_expr(p):
     p[0] = str(p[1]()).strip()
 
 
+def p_expr_val(p):
+    """expr : NUMBER"""
+    p[0] = p[1]
+
+
+def p_expr_str(p):
+    """expr : STRING"""
+    p[0] = p[1]
+
+
 def p_exprne(p):
     """expr : expr NE expr"""
     p[0] = "1" if p[1] != p[3] else "0"
@@ -858,7 +866,7 @@ def main(argv):
     return global_.has_errors
 
 
-parser = utils.get_or_create("zxbpp", lambda: yacc.yacc(debug=True))
+parser = yacc.yacc(debug=True)
 parser.defaulted_states = {}
 
 

src/zxbpp/zxbpplex.py

@@ -47,6 +47,7 @@
 
 _tokens = (
     "STRING",
+    "TEXT",
     "TOKEN",
     "NEWLINE",
     "_ENDFILE_",
@@ -196,11 +197,11 @@ def t_comment_endBlock(self, t):
         if not self.__COMMENT_LEVEL:
             t.lexer.begin("INITIAL")
 
-    def t_msg_STRING(self, t):
+    def t_msg_TEXT(self, t):
         r".*\n"
         t.lexer.lineno += 1
         t.lexer.begin("INITIAL")
-        t.value = t.value.strip()  # remove newline an spaces
+        t.value = t.value.strip()  # remove newline and spaces
         return t
 
     # Any other character is ignored until EOL
@@ -323,12 +324,7 @@ def t_prepro_pragma_INTEGER(self, t):
         r"[0-9]+"  # an integer number
         return t
 
-    def t_prepro_pragma_STRING(self, t):
-        r'"([^"\n]|"")*"'  # a doubled quoted string
-        t.value = t.value[1:-1]  # Remove quotes
-        return t
-
-    def t_INITIAL_defexpr_asm_STRING(self, t):
+    def t_INITIAL_pragma_prepro_defexpr_asm_if_STRING(self, t):
         r'"([^"\n]|"")*"'  # a doubled quoted string
         return t
 

tests/functional/error_macro.asm

@@ -1,4 +1,3 @@
-#warning "this is a warning"
-#error "this is an error"
+#warning this is a warning
+#error this is an error
 nop
-