Merge pull request #3 from boriel/feature/standardize-grammar

Feature/standardize grammar

Author: boriel

arch/zx48k/optimizer/asm.py

@@ -2,7 +2,7 @@
 
 from .patterns import RE_OUTC, RE_INDIR16
 from .helpers import single_registers
-from libzxbasm import z80
+from src.libzxbasm import z80
 
 # Dict of patterns to normalized instructions. I.e. 'ld a, 5' -> 'LD A,N'
 Z80_PATTERN = {}

arch/zx48k/optimizer/memcell.py

@@ -6,7 +6,7 @@
 from .. import backend
 from .asm import Asm
 from src.api.utils import flatten_list
-from libzxbasm import asmlex
+from src.libzxbasm import asmlex
 
 
 class MemCell(object):

arch/zx48k/translator.py

@@ -21,13 +21,13 @@
 from src.api.errors import InvalidOperatorError
 from src.api.errors import InvalidBuiltinFunctionError
 from src.api.errors import InternalError
-from libzxbpp import zxbpp
+from src.libzxbpp import zxbpp
 
 from . import backend
 from .backend.__float import _float
 
-import symbols
-from symbols.type_ import Type
+from src import symbols
+from src.symbols.type_ import Type
 from .translatorvisitor import TranslatorVisitor
 
 import arch.zx48k  # TODO: put this in global

arch/zx48k/translatorinstvisitor.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 from src.api.constants import TYPE
-import symbols
+from src import symbols
 
-from ast_ import NodeVisitor
+from src.ast import NodeVisitor
 from .backend import Quad, MEMORY
 from src.api.debug import __DEBUG__
 

arch/zx48k/translatorvisitor.py

@@ -11,11 +11,11 @@
 from src.api.constants import SCOPE
 import src.api.global_ as gl
 
-from symbols.symbol_ import Symbol
-from symbols.type_ import Type
+from src.symbols.symbol_ import Symbol
+from src.symbols.type_ import Type
 
 from . import backend
-import symbols
+from src import symbols
 
 from src.api.errors import InvalidOperatorError
 

pyproject.toml

@@ -34,19 +34,14 @@ keywords = ['compiler', 'zxspectrum', 'BASIC', 'z80']  # arbitrary keywords
 packages = [
     { include = "src/**/*" },
     { include = "arch/**/*"},
-    { include = "ast_" },
-    { include = "outfmt" },
-    { include = "ply" },
-    { include = "symbols" },
-    { include = "libzxbasm" },
-    { include = "libzxbpp" },
+    { include = "outfmt" }
 ]
 
 [tool.poetry.scripts]
 zxb = 'src.libzxbc.zxb:main'
 zxbc = 'src.libzxbc.zxb:main'
-zxbasm = 'libzxbasm.zxbasm:main'
-zxbpp = 'libzxbpp.zxbpp:entry_point'
+zxbasm = 'src.libzxbasm.zxbasm:main'
+zxbpp = 'src.libzxbpp.zxbpp:entry_point'
 
 [tool.poetry.dependencies]
 python = "^3.6"

setup.py

@@ -9,13 +9,7 @@
     'arch.zx48k.backend',
     'arch.zx48k.optimizer',
     'arch.zx48k.peephole',
-    'ast_',
-    'libzxbasm',
-    'libzxbpp',
-    'libzxbpp.prepro',
-    'outfmt',
-    'ply',
-    'symbols'
+    'outfmt'
 ]
 
 # The directory containing this file
@@ -28,9 +22,9 @@
 
 entry_points = {
     'console_scripts': ['zxb = src.libzxbc.zxb:main',
-                        'zxbasm = libzxbasm.zxbasm:main',
+                        'zxbasm = src.libzxbasm.zxbasm:main',
                         'zxbc = src.libzxbc.zxb:main',
-                        'zxbpp = libzxbpp.zxbpp:entry_point']
+                        'zxbpp = src.libzxbpp.zxbpp:entry_point']
 }
 
 setup_kwargs = {

src/api/check.py

@@ -78,7 +78,7 @@ def check_is_declared_explicit(lineno, id_, classname='variable'):
 
 
 def check_type_is_explicit(lineno: int, id_: str, type_):
-    from symbols.type_ import SymbolTYPE
+    from src.symbols.type_ import SymbolTYPE
     assert isinstance(type_, SymbolTYPE)
     if type_.implicit:
         if config.OPTIONS.strict:
@@ -114,7 +114,7 @@ def check_call_arguments(lineno, id_, args):
             return False
 
         if param.byref:
-            from symbols.var import SymbolVAR
+            from src.symbols.var import SymbolVAR
             if not isinstance(arg.value, SymbolVAR):
                 error(lineno, "Expected a variable name, not an expression (parameter By Reference)")
                 return False
@@ -210,7 +210,7 @@ def is_null(*symbols):
     """ True if no nodes or all the given nodes are either
     None, NOP or empty blocks. For blocks this applies recursively
     """
-    from symbols.symbol_ import Symbol
+    from src.symbols.symbol_ import Symbol
 
     for sym in symbols:
         if sym is None:
@@ -231,7 +231,7 @@ def is_SYMBOL(token, *symbols):
     """ Returns True if ALL of the given argument are AST nodes
     of the given token (e.g. 'BINARY')
     """
-    from symbols.symbol_ import Symbol
+    from src.symbols.symbol_ import Symbol
     assert all(isinstance(x, Symbol) for x in symbols)
     for sym in symbols:
         if sym.token != token:
@@ -295,7 +295,7 @@ def is_var(*p):
 
 
 def is_integer(*p):
-    from symbols.type_ import Type
+    from src.symbols.type_ import Type
 
     try:
         for i in p:
@@ -312,7 +312,7 @@ def is_integer(*p):
 def is_unsigned(*p):
     """ Returns false unless all types in p are unsigned
     """
-    from symbols.type_ import Type
+    from src.symbols.type_ import Type
 
     try:
         for i in p:
@@ -329,7 +329,7 @@ def is_unsigned(*p):
 def is_signed(*p):
     """ Returns false unless all types in p are signed
     """
-    from symbols.type_ import Type
+    from src.symbols.type_ import Type
 
     try:
         for i in p:
@@ -346,7 +346,7 @@ def is_signed(*p):
 def is_numeric(*p):
     """ Returns false unless all elements in p are of numerical type
     """
-    from symbols.type_ import Type
+    from src.symbols.type_ import Type
 
     try:
         for i in p:
@@ -379,7 +379,7 @@ def is_dynamic(*p):  # TODO: Explain this better
     """ True if all args are dynamic (e.g. Strings, dynamic arrays, etc)
     The use a ptr (ref) and it might change during runtime.
     """
-    from symbols.type_ import Type
+    from src.symbols.type_ import Type
 
     try:
         for i in p:
@@ -397,7 +397,7 @@ def is_dynamic(*p):  # TODO: Explain this better
 def is_callable(*p):
     """ True if all the args are functions and / or subroutines
     """
-    import symbols
+    from .. import symbols
     return all(isinstance(x, symbols.FUNCTION) for x in p)
 
 
@@ -427,9 +427,9 @@ def common_type(a, b):
     """ Returns a type which is common for both a and b types.
     Returns None if no common types allowed.
     """
-    from symbols.type_ import SymbolBASICTYPE as BASICTYPE
-    from symbols.type_ import Type as TYPE
-    from symbols.type_ import SymbolTYPE
+    from src.symbols.type_ import SymbolBASICTYPE as BASICTYPE
+    from src.symbols.type_ import Type as TYPE
+    from src.symbols.type_ import SymbolTYPE
 
     if a is None or b is None:
         return None

src/api/optimize.py

@@ -2,13 +2,13 @@
 # -*- coding: utf-8 -*-
 
 from typing import NamedTuple
-from ast_ import NodeVisitor
+from src.ast import NodeVisitor
 from .config import OPTIONS
 from src.api.errmsg import warning
 import src.api.check as chk
 from src.api.constants import TYPE, SCOPE, CLASS
 import src.api.global_ as gl
-import symbols
+from .. import symbols
 import types
 from src.api.debug import __DEBUG__
 from src.api.errmsg import warning_not_used

src/api/symboltable.py

@@ -13,8 +13,8 @@
 
 from .debug import __DEBUG__
 
-import symbols
-from symbols.symbol_ import Symbol
+from .. import symbols
+from src.symbols.symbol_ import Symbol
 
 from . import global_
 from .config import OPTIONS