Skip to content

Commit cedc3cb

Browse files
committed
Move ast_ into src/ package
Also refactor and rename it to ast since there's no longer name clash! :-)
1 parent 5f0861e commit cedc3cb

9 files changed

Lines changed: 5 additions & 7 deletions

File tree

arch/zx48k/translatorinstvisitor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from src.api.constants import TYPE
44
from src import symbols
55

6-
from ast_ import NodeVisitor
6+
from src.ast import NodeVisitor
77
from .backend import Quad, MEMORY
88
from src.api.debug import __DEBUG__
99

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ keywords = ['compiler', 'zxspectrum', 'BASIC', 'z80'] # arbitrary keywords
3434
packages = [
3535
{ include = "src/**/*" },
3636
{ include = "arch/**/*"},
37-
{ include = "ast_" },
3837
{ include = "outfmt" }
3938
]
4039

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
'arch.zx48k.backend',
1010
'arch.zx48k.optimizer',
1111
'arch.zx48k.peephole',
12-
'ast_',
1312
'outfmt'
1413
]
1514

src/api/optimize.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# -*- coding: utf-8 -*-
33

44
from typing import NamedTuple
5-
from ast_ import NodeVisitor
5+
from src.ast import NodeVisitor
66
from .config import OPTIONS
77
from src.api.errmsg import warning
88
import src.api.check as chk
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/libzxbasm/asmparse.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
from .asmlex import tokens # noqa
2020
from .asm import AsmInstruction, Error
21-
from ast_ import Ast
22-
from ast_.tree import NotAnAstError
21+
from src.ast import Ast
22+
from src.ast.tree import NotAnAstError
2323
from src.api.debug import __DEBUG__
2424
from src.api.config import OPTIONS
2525
from src.api.errmsg import error

src/symbols/symbol_.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import re
1313
from collections import Counter
1414

15-
from ast_ import Ast
15+
from src.ast import Ast
1616
import src.api.global_
1717

1818

0 commit comments

Comments
 (0)