diff options
Diffstat (limited to 'pyGHDL/dom/Type.py')
-rw-r--r-- | pyGHDL/dom/Type.py | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/pyGHDL/dom/Type.py b/pyGHDL/dom/Type.py index 2b71ccc3c..e7d9701fd 100644 --- a/pyGHDL/dom/Type.py +++ b/pyGHDL/dom/Type.py @@ -34,22 +34,21 @@ from typing import List, Union, Iterator, Tuple, Iterable from pyTooling.Decorators import export -from pyVHDLModel.SyntaxModel import ( - AnonymousType as VHDLModel_AnonymousType, - PhysicalType as VHDLModel_PhysicalType, - IntegerType as VHDLModel_IntegerType, - EnumeratedType as VHDLModel_EnumeratedType, - ArrayType as VHDLModel_ArrayType, - RecordTypeElement as VHDLModel_RecordTypeElement, - RecordType as VHDLModel_RecordType, - AccessType as VHDLModel_AccessType, - FileType as VHDLModel_FileType, - ProtectedType as VHDLModel_ProtectedType, - ProtectedTypeBody as VHDLModel_ProtectedTypeBody, - Subtype as VHDLModel_Subtype, - SubtypeOrSymbol, - Name, -) +from pyVHDLModel.Name import Name +from pyVHDLModel.Symbol import Symbol +from pyVHDLModel.Type import Subtype as VHDLModel_Subtype +from pyVHDLModel.Type import AnonymousType as VHDLModel_AnonymousType +from pyVHDLModel.Type import EnumeratedType as VHDLModel_EnumeratedType +from pyVHDLModel.Type import IntegerType as VHDLModel_IntegerType +from pyVHDLModel.Type import PhysicalType as VHDLModel_PhysicalType +from pyVHDLModel.Type import ArrayType as VHDLModel_ArrayType +from pyVHDLModel.Type import RecordTypeElement as VHDLModel_RecordTypeElement +from pyVHDLModel.Type import RecordType as VHDLModel_RecordType +from pyVHDLModel.Type import ProtectedType as VHDLModel_ProtectedType +from pyVHDLModel.Type import ProtectedTypeBody as VHDLModel_ProtectedTypeBody +from pyVHDLModel.Type import AccessType as VHDLModel_AccessType +from pyVHDLModel.Type import FileType as VHDLModel_FileType + from pyGHDL.libghdl import utils from pyGHDL.libghdl._types import Iir from pyGHDL.libghdl.vhdl import nodes, flists @@ -148,7 +147,7 @@ class PhysicalType(VHDLModel_PhysicalType, DOMMixin): @export class ArrayType(VHDLModel_ArrayType, DOMMixin): - def __init__(self, node: Iir, identifier: str, indices: List, elementSubtype: SubtypeOrSymbol): + def __init__(self, node: Iir, identifier: str, indices: List, elementSubtype: Symbol): super().__init__(identifier, indices, elementSubtype) DOMMixin.__init__(self, node) @@ -180,7 +179,7 @@ class ArrayType(VHDLModel_ArrayType, DOMMixin): @export class RecordTypeElement(VHDLModel_RecordTypeElement, DOMMixin): - def __init__(self, node: Iir, identifiers: List[str], subtype: SubtypeOrSymbol): + def __init__(self, node: Iir, identifiers: List[str], subtype: Symbol): super().__init__(identifiers, subtype) DOMMixin.__init__(self, node) @@ -288,7 +287,7 @@ class ProtectedTypeBody(VHDLModel_ProtectedTypeBody, DOMMixin): @export class AccessType(VHDLModel_AccessType, DOMMixin): - def __init__(self, node: Iir, identifier: str, designatedSubtype: SubtypeOrSymbol): + def __init__(self, node: Iir, identifier: str, designatedSubtype: Symbol): super().__init__(identifier, designatedSubtype) DOMMixin.__init__(self, node) @@ -304,7 +303,7 @@ class AccessType(VHDLModel_AccessType, DOMMixin): @export class FileType(VHDLModel_FileType, DOMMixin): - def __init__(self, node: Iir, identifier: str, designatedSubtype: SubtypeOrSymbol): + def __init__(self, node: Iir, identifier: str, designatedSubtype: Symbol): super().__init__(identifier, designatedSubtype) DOMMixin.__init__(self, node) |