Refact and move libzxbc into src package

Author: boriel

pyproject.toml

@@ -38,14 +38,13 @@ packages = [
     { include = "outfmt" },
     { include = "ply" },
     { include = "symbols" },
-    { include = "libzxbc" },
     { include = "libzxbasm" },
     { include = "libzxbpp" },
 ]
 
 [tool.poetry.scripts]
-zxb = 'libzxbc.zxb:main'
-zxbc = 'libzxbc.zxb:main'
+zxb = 'src.libzxbc.zxb:main'
+zxbc = 'src.libzxbc.zxb:main'
 zxbasm = 'libzxbasm.zxbasm:main'
 zxbpp = 'libzxbpp.zxbpp:entry_point'
 

setup.py

@@ -11,7 +11,6 @@
     'arch.zx48k.peephole',
     'ast_',
     'libzxbasm',
-    'libzxbc',
     'libzxbpp',
     'libzxbpp.prepro',
     'outfmt',
@@ -28,9 +27,9 @@
 package_data = {'': ['*'], 'arch.zx48k.peephole': ['opts/*']}
 
 entry_points = {
-    'console_scripts': ['zxb = libzxbc.zxb:main',
+    'console_scripts': ['zxb = src.libzxbc.zxb:main',
                         'zxbasm = libzxbasm.zxbasm:main',
-                        'zxbc = libzxbc.zxb:main',
+                        'zxbc = src.libzxbc.zxb:main',
                         'zxbpp = libzxbpp.zxbpp:entry_point']
 }
 

libzxbc/__init__.py src/libzxbc/__init__.pylibzxbc/__init__.py renamed to src/libzxbc/__init__.py

@@ -36,7 +36,6 @@
 from src.api.check import is_static
 from src.api.check import is_string
 
-
 from src.api.constants import CLASS
 from src.api.constants import SCOPE
 from src.api.constants import KIND
@@ -57,7 +56,8 @@
 
 # Lexers and parsers, etc
 import ply.yacc as yacc
-from . import zxblex
+from src.libzxbc import zxblex
+from src.libzxbc.zxblex import tokens  # noqa
 from libzxbpp import zxbpp
 import arch
 

libzxbc/keywords.py src/libzxbc/keywords.pylibzxbc/keywords.py renamed to src/libzxbc/keywords.py

@@ -1,4 +1,4 @@
-'zxbppparse', (0, 69354)
-'asmparse', (69632, 253939)
-'zxnext_asmparse', (323584, 284883)
-'zxbparser', (608768, 709723)
+'asmparse', (0, 253944)
+'zxnext_asmparse', (253952, 284893)
+'zxbppparse', (539136, 69359)
+'zxbparser', (608768, 710704)