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

Move api/ to src/api

Author: boriel

.gitignore

@@ -6,17 +6,11 @@
 .idea/
 .python-version
 .tox/
-/parsetab/parser.out
-/parsetab/zxbasmlextab.py
-/parsetab/zxbasmtab.py
-/parsetab/zxblextab.py
-/parsetab/zxbpptab.py
-/parsetab/zxbtab.py
 MANIFEST
 dist/
 examples/*.bin
 examples/*.tzx
 scratch/
-.coverage
+.coverage/
 htmlcov/
 build/

arch/zx48k/__init__.py

@@ -5,8 +5,8 @@
 from . import beep
 from .translator import *  # noqa
 
-import api.global_
-from api.constants import TYPE
+import src.api.global_
+from src.api.constants import TYPE
 
 
 __all__ = [
@@ -17,10 +17,10 @@
 # -----------------------------------------
 # Arch initialization setup
 # -----------------------------------------
-api.global_.PARAM_ALIGN = 2  # Z80 param align
-api.global_.BOUND_TYPE = TYPE.uinteger
-api.global_.SIZE_TYPE = TYPE.ubyte
-api.global_.PTR_TYPE = TYPE.uinteger
-api.global_.STR_INDEX_TYPE = TYPE.uinteger
-api.global_.MIN_STRSLICE_IDX = 0      # Min. string slicing position
-api.global_.MAX_STRSLICE_IDX = 65534  # Max. string slicing position
+src.api.global_.PARAM_ALIGN = 2  # Z80 param align
+src.api.global_.BOUND_TYPE = TYPE.uinteger
+src.api.global_.SIZE_TYPE = TYPE.ubyte
+src.api.global_.PTR_TYPE = TYPE.uinteger
+src.api.global_.STR_INDEX_TYPE = TYPE.uinteger
+src.api.global_.MIN_STRSLICE_IDX = 0      # Min. string slicing position
+src.api.global_.MAX_STRSLICE_IDX = 65534  # Max. string slicing position

arch/zx48k/backend/__float.py

@@ -15,7 +15,7 @@
 # -----------------------------------------------------
 # Floating Point operators
 # -----------------------------------------------------
-from api import fp
+from src.api import fp
 
 
 def _float(op):

arch/zx48k/backend/__init__.py

@@ -86,8 +86,8 @@
 # External functions
 from ..optimizer.helpers import HI16, LO16
 from arch.zx48k.optimizer.asm import Asm
-from api.config import OPTIONS
-import api.fp
+from src.api.config import OPTIONS
+import src.api.fp
 
 from arch.zx48k.peephole import engine
 
@@ -488,7 +488,7 @@ def _data(ins):
         size = "B"
         q = ['"%s"' % x.replace('"', '""') for x in q]
     elif t == 'f':
-        dat_ = [api.fp.immediate_float(float(x)) for x in q]
+        dat_ = [src.api.fp.immediate_float(float(x)) for x in q]
         for x in dat_:
             output.extend(['DEFB %s' % x[0], 'DEFW %s, %s' % (x[1], x[2])])
         return output

arch/zx48k/backend/__parray.py

@@ -9,7 +9,7 @@
 # This module contains local array (both parameters and
 # comparation intermediate-code traductions
 # --------------------------------------------------------------
-from api import fp
+from src.api import fp
 from .__common import REQUIRES
 from .__float import _fpush
 from .__f16 import f16

arch/zx48k/backend/errors.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 # vim:ts=4:et:sw=4:
 
-from api.errors import Error
+from src.api.errors import Error
 
 __all__ = ['GenericError',
            'InvalidICError',

arch/zx48k/optimizer/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from api.utils import flatten_list
+from src.api.utils import flatten_list
 from arch.zx48k.peephole import engine
 
 from .patterns import RE_PRAGMA, RE_LABEL
@@ -9,8 +9,8 @@
 from .basicblock import DummyBasicBlock
 from . import basicblock
 from .labelinfo import LabelInfo
-from api.config import OPTIONS
-from api.debug import __DEBUG__
+from src.api.config import OPTIONS
+from src.api.debug import __DEBUG__
 
 
 def init():

arch/zx48k/optimizer/basicblock.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
 import arch
-import api.utils
-import api.config
+import src.api.utils
+import src.api.config
 
-from api.debug import __DEBUG__
-from api.identityset import IdentitySet
+from src.api.debug import __DEBUG__
+from src.api.identityset import IdentitySet
 from .memcell import MemCell
 from .labelinfo import LabelInfo
 from .helpers import ALL_REGS, END_PROGRAM_LABEL
@@ -389,7 +389,7 @@ def is_used(self, regs, i, top=None):
 
             return True
 
-        regs = api.utils.flatten_list([helpers.single_registers(x) for x in regs])  # make a copy
+        regs = src.api.utils.flatten_list([helpers.single_registers(x) for x in regs])  # make a copy
         for ii in range(i, top):
             if any(r in regs for r in self.mem[ii].requires):
                 return True
@@ -565,7 +565,7 @@ def optimize(self, patterns_list):
             'z': str(self.cpu.Z) if self.cpu.Z is not None else helpers.new_tmp_val()
         }.get(x.lower(), helpers.new_tmp_val())
 
-        if api.config.OPTIONS.optimization > 3:
+        if src.api.config.OPTIONS.optimization > 3:
             regs, mems = self.guesses_initial_state_from_origin_blocks()
         else:
             regs, mems = {}, {}
@@ -591,8 +591,8 @@ def optimize(self, patterns_list):
                     new_code = list(code)
                     matched = new_code[i: i + len(p.patt)]
                     new_code[i: i + len(p.patt)] = p.template.filter(match)
-                    api.errmsg.info('pattern applied [{}:{}]'.format("%03i" % p.flag, p.fname))
-                    api.debug.__DEBUG__('matched: \n    {}'.format('\n    '.join(matched)), level=1)
+                    src.api.errmsg.info('pattern applied [{}:{}]'.format("%03i" % p.flag, p.fname))
+                    src.api.debug.__DEBUG__('matched: \n    {}'.format('\n    '.join(matched)), level=1)
                     changed = new_code != code
                     if changed:
                         code = new_code

arch/zx48k/optimizer/errors.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from api.errors import Error
+from src.api.errors import Error
 
 
 class DuplicatedLabelError(Error):

arch/zx48k/optimizer/labelinfo.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from api.identityset import IdentitySet
+from src.api.identityset import IdentitySet
 from . import common
 from . import errors