Move zxbpp into src

boriel · boriel · commit 5f0861e4ea13 · 2020-11-10T00:04:16.000+01:00
Updates .dbm cache
diff --git a/arch/zx48k/translator.py b/arch/zx48k/translator.py
@@ -21,7 +21,7 @@
 from src.api.errors import InvalidOperatorError
 from src.api.errors import InvalidBuiltinFunctionError
 from src.api.errors import InternalError
-from libzxbpp import zxbpp
+from src.libzxbpp import zxbpp
 
 from . import backend
 from .backend.__float import _float
diff --git a/pyproject.toml b/pyproject.toml
@@ -35,15 +35,14 @@ packages = [
     { include = "src/**/*" },
     { include = "arch/**/*"},
     { include = "ast_" },
-    { include = "outfmt" },
-    { include = "libzxbpp" },
+    { include = "outfmt" }
 ]
 
 [tool.poetry.scripts]
 zxb = 'src.libzxbc.zxb:main'
 zxbc = 'src.libzxbc.zxb:main'
 zxbasm = 'src.libzxbasm.zxbasm:main'
-zxbpp = 'libzxbpp.zxbpp:entry_point'
+zxbpp = 'src.libzxbpp.zxbpp:entry_point'
 
 [tool.poetry.dependencies]
 python = "^3.6"
diff --git a/setup.py b/setup.py
@@ -10,8 +10,6 @@
     'arch.zx48k.optimizer',
     'arch.zx48k.peephole',
     'ast_',
-    'libzxbpp',
-    'libzxbpp.prepro',
     'outfmt'
 ]
 
@@ -27,7 +25,7 @@
     'console_scripts': ['zxb = src.libzxbc.zxb:main',
                         'zxbasm = src.libzxbasm.zxbasm:main',
                         'zxbc = src.libzxbc.zxb:main',
-                        'zxbpp = libzxbpp.zxbpp:entry_point']
+                        'zxbpp = src.libzxbpp.zxbpp:entry_point']
 }
 
 setup_kwargs = {
diff --git a/src/libzxbasm/asmparse.py b/src/libzxbasm/asmparse.py
@@ -26,7 +26,7 @@
 from src.api.errmsg import warning
 from src.api import global_ as gl
 import src.api.utils
-from libzxbpp import zxbpp
+from src.libzxbpp import zxbpp
 import outfmt
 
 LEXER = asmlex.Lexer()
diff --git a/src/libzxbasm/zxbasm.py b/src/libzxbasm/zxbasm.py
@@ -16,7 +16,7 @@
 import argparse
 
 from . import asmparse
-from libzxbpp import zxbpp
+from src.libzxbpp import zxbpp
 
 import src.api.config
 from src.api.config import OPTIONS
diff --git a/src/libzxbc/zxb.py b/src/libzxbc/zxb.py
@@ -17,7 +17,7 @@
 from .version import VERSION
 
 from . import zxbparser, zxblex
-from libzxbpp import zxbpp
+from src.libzxbpp import zxbpp
 from src.libzxbasm import asmparse
 
 from src.api.config import OPTIONS
diff --git a/src/libzxbc/zxbparser.py b/src/libzxbc/zxbparser.py
@@ -58,7 +58,7 @@
 import src.ply.yacc as yacc
 from src.libzxbc import zxblex
 from src.libzxbc.zxblex import tokens  # noqa
-from libzxbpp import zxbpp
+from src.libzxbpp import zxbpp
 import arch
 
 # ----------------------------------------------------------------------
diff --git a/src/libzxbpp/__init__.py b/src/libzxbpp/__init__.py
diff --git a/src/libzxbpp/prepro/__init__.py b/src/libzxbpp/prepro/__init__.py
diff --git a/src/libzxbpp/prepro/args.py b/src/libzxbpp/prepro/args.py
diff --git a/src/libzxbpp/prepro/definestable.py b/src/libzxbpp/prepro/definestable.py
diff --git a/src/libzxbpp/prepro/exceptions.py b/src/libzxbpp/prepro/exceptions.py
diff --git a/src/libzxbpp/prepro/id_.py b/src/libzxbpp/prepro/id_.py
diff --git a/src/libzxbpp/prepro/macrocall.py b/src/libzxbpp/prepro/macrocall.py
diff --git a/src/libzxbpp/prepro/output.py b/src/libzxbpp/prepro/output.py
diff --git a/src/libzxbpp/zxbasmpplex.py b/src/libzxbpp/zxbasmpplex.py
@@ -12,9 +12,10 @@
 
 import os
 import sys
+
 from src.ply import lex
 import src.api.utils
-from libzxbpp.prepro.output import warning, error
+from src.libzxbpp.prepro.output import warning, error
 
 EOL = '\n'
 
diff --git a/src/libzxbpp/zxbpp.py b/src/libzxbpp/zxbpp.py
@@ -98,6 +98,7 @@ def get_include_path():
     return os.path.realpath(os.path.join(
         os.path.dirname(__file__),
         os.path.pardir,
+        os.path.pardir,
         'arch',
         OPTIONS.architecture or '')
     )
diff --git a/src/libzxbpp/zxbpplex.py b/src/libzxbpp/zxbpplex.py
@@ -12,7 +12,7 @@
 
 import sys
 from src.ply import lex
-from libzxbpp.prepro.output import warning, error
+from src.libzxbpp.prepro.output import warning, error
 import src.api.utils
 
 EOL = '\n'
diff --git a/src/parsetab/tabs.dbm.bak b/src/parsetab/tabs.dbm.bak
@@ -0,0 +1,4 @@
+'asmparse', (0, 254316)
+'zxnext_asmparse', (254464, 285309)
+'zxbppparse', (540160, 69623)
+'zxbparser', (609792, 710716)
diff --git a/src/parsetab/tabs.dbm.dat b/src/parsetab/tabs.dbm.dat
diff --git a/src/parsetab/tabs.dbm.dir b/src/parsetab/tabs.dbm.dir
@@ -0,0 +1,4 @@
+'asmparse', (0, 254316)
+'zxnext_asmparse', (254464, 285309)
+'zxbppparse', (540160, 69623)
+'zxbparser', (609792, 710716)
diff --git a/tests/functional/test.py b/tests/functional/test.py
@@ -31,8 +31,7 @@
 
 # Now we can import the modules from the root
 import src.api.utils  # noqa
-from src import libzxbc, libzxbasm  # noqa
-import libzxbpp  # noqa
+from src import libzxbc, libzxbasm, libzxbpp  # noqa
 
 # global FLAGS
 CLOSE_STDERR = False  # Whether to show compiler error or not (usually not when doing tests)
diff --git a/tests/symbols/test_symbolARRAYACCESS.py b/tests/symbols/test_symbolARRAYACCESS.py
@@ -10,7 +10,7 @@
 import src.api.config as config
 from src.api.symboltable import SymbolTable
 from src.symbols.type_ import Type
-from libzxbpp import zxbpp
+from src.libzxbpp import zxbpp
 
 
 class TestSymbolARRAYACCESS(TestCase):
diff --git a/tests/symbols/test_symbolBINARY.py b/tests/symbols/test_symbolBINARY.py
@@ -7,7 +7,7 @@
 from src.api.config import OPTIONS
 from src import symbols
 from src.symbols.type_ import Type
-from libzxbpp import zxbpp
+from src.libzxbpp import zxbpp
 
 
 class TestSymbolBINARY(TestCase):
diff --git a/tests/symbols/test_symbolBOUND.py b/tests/symbols/test_symbolBOUND.py
@@ -7,7 +7,7 @@
 
 from src.api.config import OPTIONS
 from src import symbols
-from libzxbpp import zxbpp
+from src.libzxbpp import zxbpp
 
 
 class TestSymbolBOUND(TestCase):
diff --git a/tests/symbols/test_symbolTYPECAST.py b/tests/symbols/test_symbolTYPECAST.py
@@ -9,7 +9,7 @@
 from src.api.config import OPTIONS
 from six import StringIO
 from src.api.constants import CLASS
-from libzxbpp import zxbpp
+from src.libzxbpp import zxbpp
 
 __autor__ = 'boriel'
 
diff --git a/zxbpp.py b/zxbpp.py
@@ -12,8 +12,7 @@
 # ----------------------------------------------------------------------
 
 import sys
-import libzxbpp
-
+from src import libzxbpp
 
 if __name__ == '__main__':
     sys.exit(libzxbpp.entry_point())
