Merge pull request #541 from boriel/feature/user_macros_in_include_filenames

Allow #include macro

Author: boriel

src/parsetab/tabs.dbm.bak

@@ -1,4 +1,4 @@
-'zxbpp', (0, 73193)
-'asmparse', (73216, 271961)
-'zxnext_asmparse', (345600, 302573)
-'zxbparser', (648192, 703160)
+'zxbpp', (0, 76970)
+'asmparse', (77312, 271961)
+'zxnext_asmparse', (349696, 302573)
+'zxbparser', (652288, 703160)

src/parsetab/tabs.dbm.dat

@@ -1,4 +1,4 @@
-'zxbpp', (0, 73193)
-'asmparse', (73216, 271961)
-'zxnext_asmparse', (345600, 302573)
-'zxbparser', (648192, 703160)
+'zxbpp', (0, 76970)
+'asmparse', (77312, 271961)
+'zxnext_asmparse', (349696, 302573)
+'zxbparser', (652288, 703160)

src/parsetab/tabs.dbm.dir

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 # Operators implemented in the preprocessor
 
-
-from src.zxbpp import prepro
 from src.zxbpp.prepro.macrocall import MacroCall
+from src.zxbpp.prepro import DefinesTable
 
 
 class Concatenation(MacroCall):
@@ -13,12 +12,12 @@ class Concatenation(MacroCall):
     Out of a macro body, ID1 and ID2 are expanded normally and "##" is
     also output as is.
     """
-    def __init__(self, fname: str, lineno: int, table: 'prepro.DefinesTable', left: MacroCall, right: MacroCall):
+    def __init__(self, fname: str, lineno: int, table: DefinesTable, left: MacroCall, right: MacroCall):
         super().__init__(fname=fname, lineno=lineno, table=table, id_='')
         self.left = left
         self.right = right
 
-    def __call__(self, symbolTable: 'prepro.DefinesTable' = None) -> str:
+    def __call__(self, symbolTable: DefinesTable = None) -> str:
         return self.left(symbolTable).rstrip() + self.right(symbolTable).lstrip()
 
 
@@ -27,7 +26,7 @@ class Stringizing(MacroCall):
     macrocall into a BASIC string (double quotes " as delimiters, escaped as
     doubled-double quote 'Hello "dear"' => 'Hello ""dear""').
     """
-    def __init__(self, fname: str, lineno: int, table: 'prepro.DefinesTable', macro_call: MacroCall):
+    def __init__(self, fname: str, lineno: int, table: DefinesTable, macro_call: MacroCall):
         super().__init__(fname=fname, lineno=lineno, table=table, id_='')
         self.macro_call = macro_call
 
@@ -36,5 +35,5 @@ def stringize(s: str) -> str:
         s = s.replace('"', '""')
         return f'"{s}"'
 
-    def __call__(self, symbolTable: 'prepro.DefinesTable' = None) -> str:
+    def __call__(self, symbolTable: DefinesTable = None) -> str:
         return self.stringize(self.macro_call(symbolTable))

src/zxbpp/prepro/operators.py

@@ -14,6 +14,7 @@
 import sys
 import os
 import argparse
+import re
 
 from dataclasses import dataclass
 
@@ -64,6 +65,10 @@
 # Enabled to FALSE if IFDEF failed
 ENABLED: bool = True
 
+# Defines Regexp to match filenames
+RE_LOCAL_FIRST_FILENAME = re.compile('^"([^"]|"")*"$')
+RE_GLOBAL_FIRST_FILENAME = re.compile('^<[^>]+>$')
+
 
 class IfDef(NamedTuple):
     enabled: bool
@@ -382,6 +387,23 @@ def p_include_fname(p):
         p.lexer.next_token = '_ENDFILE_'
 
 
+def p_include_macro(p):
+    """ include : INCLUDE expr
+    """
+    global_fist = RE_GLOBAL_FIRST_FILENAME.match(p[2])
+    local_first = RE_LOCAL_FIRST_FILENAME.match(p[2])
+    if global_fist is None and local_first is None:
+        error(p.lineno(1), f"invalid filename {p[2]}")
+        p[0] = []
+        return
+
+    if ENABLED:
+        p[0] = include_file(p[2][1:-1], p.lineno(2), local_first=local_first is not None)
+    else:
+        p[0] = []
+        p.lexer.next_token = '_ENDFILE_'
+
+
 def p_include_once(p):
     """ include_once : INCLUDE ONCE STRING
     """

src/zxbpp/zxbpp.py

@@ -0,0 +1,6 @@
+
+#define a <pos.bas>
+
+#include a
+
+

tests/functional/prepro64.bi

@@ -0,0 +1,52 @@
+#line 1 "prepro64.bi"
+
+#line 3 "prepro64.bi"
+
+#line 1 "/zxbasic/src/arch/zx48k/library/pos.bas"
+
+
+
+
+
+
+
+
+
+
+
+
+
+#line 15 "/zxbasic/src/arch/zx48k/library/pos.bas"
+
+#pragma push(case_insensitive)
+#pragma case_insensitive = true
+
+
+
+
+
+
+
+
+
+function FASTCALL pos as ubyte
+    asm
+    push namespace core
+    PROC
+
+    call __LOAD_S_POSN
+    ld <pos.bas>, e
+
+    ENDP
+    pop namespace
+    end asm
+end function
+
+#pragma pop(case_insensitive)
+#require "sposn.asm"
+
+
+#line 45 "/zxbasic/src/arch/zx48k/library/pos.bas"
+#line 5 "prepro64.bi"
+
+