Merge pull request #432 from boriel/feature/add_stringizing_operator

Feature/add stringizing operator

Author: boriel

src/libzxbpp/prepro/operators.py

@@ -20,3 +20,21 @@ def __init__(self, lineno: int, table: 'prepro.DefinesTable', left: MacroCall, r
 
     def __call__(self, symbolTable: 'prepro.DefinesTable' = None) -> str:
         return self.left(symbolTable).rstrip() + self.right(symbolTable).lstrip()
+
+
+class Stringizing(MacroCall):
+    """ Implements stringizing operator (#). Converts the result of the
+    macrocall into a BASIC string (double quotes " as delimiters, escaped as
+    doubled-double quote 'Hello "dear"' => 'Hello ""dear""').
+    """
+    def __init__(self, lineno: int, table: 'prepro.DefinesTable', macro_call: MacroCall):
+        super().__init__(lineno=lineno, table=table, id_='')
+        self.macro_call = macro_call
+
+    @staticmethod
+    def stringize(s: str) -> str:
+        s = s.replace('"', '""')
+        return f'"{s}"'
+
+    def __call__(self, symbolTable: 'prepro.DefinesTable' = None) -> str:
+        return self.stringize(self.macro_call(symbolTable))

src/libzxbpp/zxbpp.py

@@ -31,6 +31,7 @@
 from .prepro import DefinesTable, ID, MacroCall, Arg, ArgList
 from .prepro.exceptions import PreprocError
 from .prepro.operators import Concatenation
+from .prepro.operators import Stringizing
 
 from src import arch
 
@@ -64,7 +65,7 @@ class IfDef(NamedTuple):
     ('nonassoc', 'DUMMY'),
     ('left', 'EQ', 'NE', 'LT', 'LE', 'GT', 'GE'),
     ('right', 'LLP'),
-    ('left', 'PASTE'),
+    ('left', 'PASTE', 'STRINGIZING'),
 )
 
 
@@ -423,14 +424,18 @@ def p_warningmsg(p):
 def p_define(p):
     """ define : DEFINE ID params defs
     """
+    id_ = p[2]
+    params = p[3]
+    defs = p[4]
+
     if ENABLED:
-        if p[4]:
-            if p[4][0] in ' \t':  # remove leading whitespaces
-                p[4][0] = p[4][0].lstrip(' \t')
+        if defs:
+            if isinstance(defs[0], str) and defs[0] in ' \t':  # remove leading whitespaces
+                defs[0] = defs[0].lstrip(' \t')
             else:
                 warning(p.lineno(1), "missing whitespace after macro name")
 
-        ID_TABLE.define(p[2], args=p[3], value=p[4], lineno=p.lineno(2),
+        ID_TABLE.define(id_, args=params, value=defs, lineno=p.lineno(2),
                         fname=output.CURRENT_FILE[-1])
     p[0] = []
 
@@ -692,6 +697,12 @@ def p_macrocall_paste(p):
     p[0] = Concatenation(p[1].lineno, ID_TABLE, p[1], p[3])
 
 
+def p_macrocall_stringizing(p):
+    """ macrocall : STRINGIZING macrocall
+    """
+    p[0] = Stringizing(p[2].lineno, ID_TABLE, p[2])
+
+
 def p_args(p):
     """ args : LLP arglist RRP
     """

src/libzxbpp/zxbpplex.py

@@ -43,7 +43,7 @@
 _tokens = ('STRING', 'TOKEN', 'NEWLINE', '_ENDFILE_', 'FILENAME', 'ID',
            'INTEGER', 'EQ', 'PUSH', 'POP', 'LP', 'LLP', 'RRP', 'RP', 'COMMA',
            'CONTINUE', 'NUMBER', 'SEPARATOR', 'GT', 'GE', 'LT', 'LE', 'NE',
-           'PASTE')
+           'PASTE', 'STRINGIZING')
 
 reserved_directives = {
     'include': 'INCLUDE',
@@ -344,6 +344,10 @@ def t_defexpr_PASTE(self, t):
         r'[ \t]*\#\#[ \t]*'
         return t
 
+    def t_defexpr_STRINGIZING(self, t):
+        r'\#[ \t]*'
+        return t
+
     def t_INITIAL_defexpr_asm_SEPARATOR(self, t):
         r'[ \t]+'
         return t

src/parsetab/tabs.dbm.bak

@@ -1,4 +1,4 @@
-'zxbpp', (0, 70950)
-'asmparse', (71168, 254311)
-'zxnext_asmparse', (325632, 285299)
-'zxbparser', (611328, 712099)
+'zxbpp', (0, 72571)
+'asmparse', (72704, 254311)
+'zxnext_asmparse', (327168, 285299)
+'zxbparser', (612864, 712099)

src/parsetab/tabs.dbm.dat

@@ -1,4 +1,4 @@
-'zxbpp', (0, 70950)
-'asmparse', (71168, 254311)
-'zxnext_asmparse', (325632, 285299)
-'zxbparser', (611328, 712099)
+'zxbpp', (0, 72571)
+'asmparse', (72704, 254311)
+'zxnext_asmparse', (327168, 285299)
+'zxbparser', (612864, 712099)

src/parsetab/tabs.dbm.dir

@@ -0,0 +1,6 @@
+
+
+#define q(a)XX##a
+
+q(5)
+

tests/functional/prepro63.bi

@@ -0,0 +1,7 @@
+#line 1 "prepro63.bi"
+
+
+
+
+XX5
+

tests/functional/prepro63.out

@@ -0,0 +1,7 @@
+
+
+#define z(x) # x
+
+z(1)
+
+

tests/functional/stringizing0.bi

@@ -0,0 +1,8 @@
+#line 1 "stringizing0.bi"
+
+
+
+
+"1"
+
+