Skip to content

Feature/standardize grammar #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
boriel merged 2 commits into from
Nov 9, 2020
Merged

Feature/standardize grammar #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75f759f
Merge pull request #1 from boriel/feature/standardize-grammar
boriel Nov 5, 2020
d7e132d
Refact and move libzxbc into src package
boriel Nov 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
5 changes: 2 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
'arch.zx48k.peephole',
'ast_',
'libzxbasm',
'libzxbc',
'libzxbpp',
'libzxbpp.prepro',
'outfmt',
Expand All @@ -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']
}

Expand Down
0 libzxbc/__init__.py → src/libzxbc/__init__.py
View file
Open in desktop
File renamed without changes.
0 libzxbc/keywords.py → src/libzxbc/keywords.py
View file
Open in desktop
File renamed without changes.
0 libzxbc/version.py → src/libzxbc/version.py
View file
Open in desktop
File renamed without changes.
0 libzxbc/zxb.py → src/libzxbc/zxb.py
View file
Open in desktop
File renamed without changes.
0 libzxbc/zxblex.py → src/libzxbc/zxblex.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions libzxbc/zxbparser.py → src/libzxbc/zxbparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
8 changes: 4 additions & 4 deletions src/parsetab/tabs.dbm.bak
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Binary file modified src/parsetab/tabs.dbm.dat
View file
Open in desktop
Binary file not shown.
8 changes: 4 additions & 4 deletions src/parsetab/tabs.dbm.dir
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion tests/cmdline/test_zxb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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__)))
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion zxb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion zxbc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import sys

import libzxbc
from src import libzxbc

if __name__ == '__main__':
sys.exit(libzxbc.main()) # Exit