Skip to content

Commit c822c56

Browse files
committed
Refactorize ZXBPP
Move it into its own directory along with its dependencies
1 parent a8e7658 commit c822c56

24 files changed

Lines changed: 843 additions & 835 deletions

parsetab/tabs.dbm.bak

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'zxbppparse', (0, 68810)
2-
'asmparse', (69120, 250690)
3-
'zxnext_asmparse', (320000, 281648)
4-
'zxbparser', (602112, 707013)
1+
'zxbppparse', (0, 69188)
2+
'asmparse', (69632, 250690)
3+
'zxnext_asmparse', (320512, 281648)
4+
'zxbparser', (602624, 707013)

parsetab/tabs.dbm.dat

512 Bytes
Binary file not shown.

parsetab/tabs.dbm.dir

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
'zxbppparse', (0, 68810)
2-
'asmparse', (69120, 250690)
3-
'zxnext_asmparse', (320000, 281648)
4-
'zxbparser', (602112, 707013)
1+
'zxbppparse', (0, 69188)
2+
'asmparse', (69632, 250690)
3+
'zxnext_asmparse', (320512, 281648)
4+
'zxbparser', (602624, 707013)

tests/functional/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def testPREPRO(fname, pattern_=None, inline=None, cmdline_args=None):
244244
using a filter_ regexp (see above).
245245
246246
:param fname: Filename (usually a .bi file) to test.
247-
:param filter_: regexp for filtering output before comparing. It will be ignored for binary (tzx, tap, etc) files
247+
:param pattern_: regexp for filtering output before comparing. It will be ignored for binary (tzx, tap, etc) files
248248
:param inline: whether the test should be run inline or using the system shell
249249
:return: True on success false if not
250250
"""

tests/symbols/test_symbolARRAYACCESS.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import api.config as config
1111
from api.symboltable import SymbolTable
1212
from symbols.type_ import Type
13-
import zxbpp
13+
from zxbpp import zxbpp
1414

1515

1616
class TestSymbolARRAYACCESS(TestCase):

tests/symbols/test_symbolBINARY.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from api.config import OPTIONS
88
import symbols
99
from symbols.type_ import Type
10-
import zxbpp
10+
from zxbpp import zxbpp
1111

1212

1313
class TestSymbolBINARY(TestCase):

tests/symbols/test_symbolBOUND.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from api.config import OPTIONS
99
import symbols
10-
import zxbpp
10+
from zxbpp import zxbpp
1111

1212

1313
class TestSymbolBOUND(TestCase):

tests/symbols/test_symbolTYPECAST.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
from api.config import OPTIONS
1010
from six import StringIO
1111
from api.constants import CLASS
12-
import zxbpp
13-
12+
from zxbpp import zxbpp
1413

1514
__autor__ = 'boriel'
1615

zxb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import zxblex
2020
import zxbparser
21-
import zxbpp
21+
from zxbpp import zxbpp
2222
from zxbasm import asmparse
2323
import arch.zx48k.backend as backend
2424

zxbasm/asmparse.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from api.errmsg import warning
2626
from api import global_ as gl
2727
import api.utils
28-
import zxbpp
28+
from zxbpp import zxbpp
2929
import outfmt
3030

3131
LEXER = asmlex.Lexer()

0 commit comments

Comments
 (0)