From d7e132dff18335b75d187ea193544888296bac1d Mon Sep 17 00:00:00 2001 From: Jose Rodriguez Date: Mon, 9 Nov 2020 01:05:41 +0100 Subject: [PATCH] Refact and move libzxbc into src package --- pyproject.toml | 5 ++--- setup.py | 5 ++--- {libzxbc => src/libzxbc}/__init__.py | 0 {libzxbc => src/libzxbc}/keywords.py | 0 {libzxbc => src/libzxbc}/version.py | 0 {libzxbc => src/libzxbc}/zxb.py | 0 {libzxbc => src/libzxbc}/zxblex.py | 0 {libzxbc => src/libzxbc}/zxbparser.py | 4 ++-- src/parsetab/tabs.dbm.bak | 8 ++++---- src/parsetab/tabs.dbm.dat | Bin 1318491 -> 1319472 bytes src/parsetab/tabs.dbm.dir | 8 ++++---- tests/cmdline/test_zxb.py | 2 +- tests/functional/test.py | 2 +- zxb.py | 2 +- zxbc.py | 2 +- 15 files changed, 18 insertions(+), 20 deletions(-) rename {libzxbc => src/libzxbc}/__init__.py (100%) rename {libzxbc => src/libzxbc}/keywords.py (100%) rename {libzxbc => src/libzxbc}/version.py (100%) rename {libzxbc => src/libzxbc}/zxb.py (100%) rename {libzxbc => src/libzxbc}/zxblex.py (100%) rename {libzxbc => src/libzxbc}/zxbparser.py (99%) diff --git a/pyproject.toml b/pyproject.toml index a061b0290..ebc4794f1 100644 --- a/pyproject.toml +++ b/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' diff --git a/setup.py b/setup.py index ab914ea9d..5cbe82b44 100644 --- a/setup.py +++ b/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'] } diff --git a/libzxbc/__init__.py b/src/libzxbc/__init__.py similarity index 100% rename from libzxbc/__init__.py rename to src/libzxbc/__init__.py diff --git a/libzxbc/keywords.py b/src/libzxbc/keywords.py similarity index 100% rename from libzxbc/keywords.py rename to src/libzxbc/keywords.py diff --git a/libzxbc/version.py b/src/libzxbc/version.py similarity index 100% rename from libzxbc/version.py rename to src/libzxbc/version.py diff --git a/libzxbc/zxb.py b/src/libzxbc/zxb.py similarity index 100% rename from libzxbc/zxb.py rename to src/libzxbc/zxb.py diff --git a/libzxbc/zxblex.py b/src/libzxbc/zxblex.py similarity index 100% rename from libzxbc/zxblex.py rename to src/libzxbc/zxblex.py diff --git a/libzxbc/zxbparser.py b/src/libzxbc/zxbparser.py similarity index 99% rename from libzxbc/zxbparser.py rename to src/libzxbc/zxbparser.py index 9783702b4..e66360c01 100755 --- a/libzxbc/zxbparser.py +++ b/src/libzxbc/zxbparser.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 diff --git a/src/parsetab/tabs.dbm.bak b/src/parsetab/tabs.dbm.bak index e4f12774f..c5638a186 100644 --- a/src/parsetab/tabs.dbm.bak +++ b/src/parsetab/tabs.dbm.bak @@ -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) diff --git a/src/parsetab/tabs.dbm.dat b/src/parsetab/tabs.dbm.dat index dc6aa1f2336cb4a9bd36ed6bec5d735c9cad40af..ebbd2372ed0bbb999bbbde4905ebc5e9a970dfb4 100644 GIT binary patch delta 7991 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 diff --git a/src/parsetab/tabs.dbm.dir b/src/parsetab/tabs.dbm.dir index e4f12774f..c5638a186 100644 --- a/src/parsetab/tabs.dbm.dir +++ b/src/parsetab/tabs.dbm.dir @@ -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) diff --git a/tests/cmdline/test_zxb.py b/tests/cmdline/test_zxb.py index 8465fdae5..a122bde85 100644 --- a/tests/cmdline/test_zxb.py +++ b/tests/cmdline/test_zxb.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import pytest -from libzxbc import zxb +from src.libzxbc import zxb import os PATH = os.path.realpath(os.path.dirname(os.path.abspath(__file__))) diff --git a/tests/functional/test.py b/tests/functional/test.py index 2fc8f0f15..b867d196c 100755 --- a/tests/functional/test.py +++ b/tests/functional/test.py @@ -31,7 +31,7 @@ # Now we can import the modules from the root import src.api.utils # noqa -import libzxbc # noqa +from src import libzxbc # noqa import libzxbasm # noqa import libzxbpp # noqa diff --git a/zxb.py b/zxb.py index ab73a8152..5073e1f95 100755 --- a/zxb.py +++ b/zxb.py @@ -4,7 +4,7 @@ import sys -import libzxbc +from src import libzxbc if __name__ == '__main__': print('-' * 48 + '\n* WARNING: zxb is deprecated! Use zxbc instead *\n' + '-' * 48, file=sys.stderr) diff --git a/zxbc.py b/zxbc.py index 6224565bc..5e6651cdb 100755 --- a/zxbc.py +++ b/zxbc.py @@ -4,7 +4,7 @@ import sys -import libzxbc +from src import libzxbc if __name__ == '__main__': sys.exit(libzxbc.main()) # Exit