Merge pull request boriel-basic#639 from boriel/refact/move_convert_s…

…ymbol_id_to_a_package

refact: convert id_ into a package

src/api/optimize.py

@@ -14,8 +14,8 @@
 from src.api.debug import __DEBUG__
 from src.api.errmsg import warning_not_used
 from src.ast import NodeVisitor
-from src.symbols import ref
 from src.symbols import sym as symbols
+from src.symbols.id_ import ref
 
 
 class ToVisit(NamedTuple):

src/arch/z80/translator.py

@@ -22,8 +22,8 @@
 from src.arch.z80.backend._float import _float
 from src.arch.z80.backend.runtime import Labels as RuntimeLabel
 from src.arch.z80.translatorvisitor import JumpTable, TranslatorVisitor
-from src.symbols import ref
 from src.symbols import sym as symbols
+from src.symbols.id_ import ref
 from src.symbols.type_ import Type
 from src.zxbpp import zxbpp
 

src/symbols/arrayaccess.py

@@ -15,13 +15,12 @@
 import src.api.errmsg as errmsg
 import src.api.global_ as gl
 from src.api.constants import SCOPE
+from src.symbols.arglist import SymbolARGLIST
+from src.symbols.binary import SymbolBINARY as BINARY
+from src.symbols.call import SymbolCALL
 from src.symbols.id_ import SymbolID
-
-from .arglist import SymbolARGLIST
-from .binary import SymbolBINARY as BINARY
-from .call import SymbolCALL
-from .number import SymbolNUMBER as NUMBER
-from .typecast import SymbolTYPECAST as TYPECAST
+from src.symbols.number import SymbolNUMBER as NUMBER
+from src.symbols.typecast import SymbolTYPECAST as TYPECAST
 
 
 class SymbolARRAYACCESS(SymbolCALL):

src/symbols/arrayload.py

@@ -9,7 +9,7 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
-from .arrayaccess import SymbolARRAYACCESS
+from src.symbols.arrayaccess import SymbolARRAYACCESS
 
 
 class SymbolARRAYLOAD(SymbolARRAYACCESS):

src/symbols/call.py

@@ -18,7 +18,7 @@
 from src.symbols.arglist import SymbolARGLIST
 from src.symbols.argument import SymbolARGUMENT
 from src.symbols.id_ import SymbolID
-from src.symbols.ref import FuncRef
+from src.symbols.id_.ref import FuncRef
 from src.symbols.symbol_ import Symbol
 from src.symbols.type_ import Type
 

src/symbols/id_/__init__.py

@@ -0,0 +1 @@
+from src.symbols.id_._id import SymbolID

src/symbols/id_.py → src/symbols/id_/_id.py

@@ -16,9 +16,9 @@
 from src.api import global_
 from src.api.config import OPTIONS
 from src.api.constants import CLASS, SCOPE
-from src.symbols import ref
-from src.symbols._id_interface import SymbolIdABC
 from src.symbols.boundlist import SymbolBOUNDLIST
+from src.symbols.id_ import ref
+from src.symbols.id_.interface import SymbolIdABC
 from src.symbols.symbol_ import Symbol
 from src.symbols.type_ import SymbolTYPE
 

src/symbols/id_/ref/__init__.py

@@ -0,0 +1,8 @@
+__all__ = ("SymbolRef", "ArrayRef", "ConstRef", "FuncRef", "LabelRef", "VarRef")
+
+from src.symbols.id_.ref.arrayref import ArrayRef
+from src.symbols.id_.ref.constref import ConstRef
+from src.symbols.id_.ref.funcref import FuncRef
+from src.symbols.id_.ref.labelref import LabelRef
+from src.symbols.id_.ref.symbolref import SymbolRef
+from src.symbols.id_.ref.varref import VarRef

src/symbols/ref/arrayref.py → src/symbols/id_/ref/arrayref.py

@@ -3,9 +3,9 @@
 
 from src.api import global_ as gl
 from src.api.constants import CLASS, SCOPE, TYPE
-from src.symbols._id_interface import SymbolIdABC as SymbolID
 from src.symbols.boundlist import SymbolBOUNDLIST
-from src.symbols.ref.varref import VarRef
+from src.symbols.id_.interface import SymbolIdABC as SymbolID
+from src.symbols.id_.ref.varref import VarRef
 
 
 class ArrayRef(VarRef):

src/symbols/ref/constref.py → src/symbols/id_/ref/constref.py

@@ -1,6 +1,6 @@
 from src.api.constants import CLASS
-from src.symbols._id_interface import SymbolIdABC as SymbolID
-from src.symbols.ref.symbolref import SymbolRef
+from src.symbols.id_.interface import SymbolIdABC as SymbolID
+from src.symbols.id_.ref.symbolref import SymbolRef
 from src.symbols.symbol_ import Symbol
 
 

src/symbols/ref/funcref.py → src/symbols/id_/ref/funcref.py

@@ -1,10 +1,10 @@
 from typing import Optional
 
 from src.api.constants import CLASS, CONVENTION
-from src.symbols._id_interface import SymbolIdABC as SymbolID
 from src.symbols.block import SymbolBLOCK
+from src.symbols.id_.interface import SymbolIdABC as SymbolID
+from src.symbols.id_.ref.symbolref import SymbolRef
 from src.symbols.paramlist import SymbolPARAMLIST
-from src.symbols.ref.symbolref import SymbolRef
 
 
 class FuncRef(SymbolRef):

src/symbols/ref/labelref.py → src/symbols/id_/ref/labelref.py

@@ -2,8 +2,8 @@
 
 from src.api import global_
 from src.api.constants import CLASS
-from src.symbols._id_interface import SymbolIdABC as SymbolID
-from src.symbols.ref.symbolref import SymbolRef
+from src.symbols.id_.interface import SymbolIdABC as SymbolID
+from src.symbols.id_.ref.symbolref import SymbolRef
 from src.symbols.symbol_ import Symbol
 
 

src/symbols/ref/symbolref.py → src/symbols/id_/ref/symbolref.py

@@ -1,6 +1,6 @@
 from src.api import global_
 from src.api.constants import CLASS
-from src.symbols._id_interface import SymbolIdABC as SymbolID
+from src.symbols.id_.interface import SymbolIdABC as SymbolID
 
 
 class SymbolRef:

src/symbols/ref/varref.py → src/symbols/id_/ref/varref.py

@@ -2,8 +2,8 @@
 
 import src.api.global_ as gl
 from src.api.constants import CLASS, SCOPE
-from src.symbols._id_interface import SymbolIdABC as SymbolID
-from src.symbols.ref.symbolref import SymbolRef
+from src.symbols.id_.interface import SymbolIdABC as SymbolID
+from src.symbols.id_.ref.symbolref import SymbolRef
 from src.symbols.symbol_ import Symbol
 from src.symbols.type_ import SymbolBASICTYPE as BasicType
 

src/symbols/paramlist.py

@@ -9,7 +9,7 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
-from src.symbols._id_interface import SymbolIdABC as SymbolID
+from src.symbols.id_.interface import SymbolIdABC as SymbolID
 from src.symbols.symbol_ import Symbol
 
 

src/symbols/sentence.py

@@ -9,7 +9,7 @@
 #                    the GNU General License v3
 # ----------------------------------------------------------------------
 
-from .symbol_ import Symbol
+from src.symbols.symbol_ import Symbol
 
 
 class SymbolSENTENCE(Symbol):

src/symbols/string_.py

@@ -11,9 +11,8 @@
 from __future__ import annotations
 
 from src.api.constants import CLASS
-
-from .symbol_ import Symbol
-from .type_ import Type
+from src.symbols.symbol_ import Symbol
+from src.symbols.type_ import Type
 
 
 class SymbolSTRING(Symbol):

src/symbols/strslice.py

@@ -12,13 +12,12 @@
 import src.api.check as check
 import src.api.config as config
 import src.api.global_ as gl
-
-from .binary import SymbolBINARY as BINARY
-from .number import SymbolNUMBER as NUMBER
-from .string_ import SymbolSTRING as STRING
-from .symbol_ import Symbol
-from .type_ import Type
-from .typecast import SymbolTYPECAST as TYPECAST
+from src.symbols.binary import SymbolBINARY as BINARY
+from src.symbols.number import SymbolNUMBER as NUMBER
+from src.symbols.string_ import SymbolSTRING as STRING
+from src.symbols.symbol_ import Symbol
+from src.symbols.type_ import Type
+from src.symbols.typecast import SymbolTYPECAST as TYPECAST
 
 
 class SymbolSTRSLICE(Symbol):

src/symbols/unary.py

@@ -10,13 +10,12 @@
 # ----------------------------------------------------------------------
 
 import src.api.check as check
-
-from .number import SymbolNUMBER
-from .string_ import SymbolSTRING
-from .symbol_ import Symbol
-from .type_ import SymbolTYPE
-from .type_ import Type as TYPE
-from .typecast import SymbolTYPECAST
+from src.symbols.number import SymbolNUMBER
+from src.symbols.string_ import SymbolSTRING
+from src.symbols.symbol_ import Symbol
+from src.symbols.type_ import SymbolTYPE
+from src.symbols.type_ import Type as TYPE
+from src.symbols.typecast import SymbolTYPECAST
 
 
 class SymbolUNARY(Symbol):

src/symbols/vardecl.py

@@ -9,7 +9,7 @@
 #                    the GNU General License
 # ----------------------------------------------------------------------
 
-from .symbol_ import Symbol
+from src.symbols.symbol_ import Symbol
 
 
 class SymbolVARDECL(Symbol):