pyVHDLModel 0.34.0__tar.gz → 0.35.0__tar.gz

{pyvhdlmodel-0.34.0 → pyvhdlmodel-0.35.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyVHDLModel
-Version: 0.34.0
+Version: 0.35.0
 Summary: An abstract VHDL language model.
 Home-page: https://GitHub.com/VHDL/pyVHDLModel
 Author: Patrick Lehmann
@@ -28,41 +28,41 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: pyTooling~=8.14
 Provides-Extra: doc
-Requires-Dist: autoapi>=2.0.1; extra == "doc"
-Requires-Dist: sphinx_autodoc_typehints~=3.10; extra == "doc"
+Requires-Dist: sphinx_design~=0.7.0; extra == "doc"
 Requires-Dist: sphinx-copybutton>=0.5.2; extra == "doc"
+Requires-Dist: docutils_stubs~=0.0.22; extra == "doc"
 Requires-Dist: sphinx~=9.1; extra == "doc"
+Requires-Dist: autoapi>=2.0.1; extra == "doc"
+Requires-Dist: sphinx_reports~=0.11.0; extra == "doc"
+Requires-Dist: sphinx_autodoc_typehints~=3.11; extra == "doc"
+Requires-Dist: sphinx_rtd_theme~=3.1; extra == "doc"
 Requires-Dist: sphinxcontrib-mermaid~=2.0; extra == "doc"
-Requires-Dist: docutils_stubs~=0.0.22; extra == "doc"
-Requires-Dist: sphinx_reports~=0.10.0; extra == "doc"
-Requires-Dist: sphinx_design~=0.7.0; extra == "doc"
 Requires-Dist: pyTooling~=8.14; extra == "doc"
-Requires-Dist: sphinx_rtd_theme~=3.1; extra == "doc"
 Provides-Extra: test
-Requires-Dist: lxml<7.0,>=5.4; extra == "test"
+Requires-Dist: pytest~=9.0; extra == "test"
 Requires-Dist: pytest-cov~=7.1; extra == "test"
-Requires-Dist: Coverage~=7.13; extra == "test"
+Requires-Dist: Coverage~=7.14; extra == "test"
 Requires-Dist: typing_extensions~=4.15; extra == "test"
+Requires-Dist: lxml<7.0,>=5.4; extra == "test"
 Requires-Dist: mypy[reports]~=1.19; extra == "test"
-Requires-Dist: pytest~=9.0; extra == "test"
 Requires-Dist: pyTooling~=8.14; extra == "test"
 Provides-Extra: all
-Requires-Dist: autoapi>=2.0.1; extra == "all"
-Requires-Dist: sphinx_autodoc_typehints~=3.10; extra == "all"
+Requires-Dist: pytest~=9.0; extra == "all"
+Requires-Dist: sphinx_design~=0.7.0; extra == "all"
 Requires-Dist: sphinx-copybutton>=0.5.2; extra == "all"
-Requires-Dist: sphinx~=9.1; extra == "all"
-Requires-Dist: lxml<7.0,>=5.4; extra == "all"
-Requires-Dist: sphinxcontrib-mermaid~=2.0; extra == "all"
 Requires-Dist: docutils_stubs~=0.0.22; extra == "all"
-Requires-Dist: mypy[reports]~=1.19; extra == "all"
 Requires-Dist: pytest-cov~=7.1; extra == "all"
-Requires-Dist: Coverage~=7.13; extra == "all"
+Requires-Dist: Coverage~=7.14; extra == "all"
+Requires-Dist: sphinx~=9.1; extra == "all"
+Requires-Dist: mypy[reports]~=1.19; extra == "all"
+Requires-Dist: autoapi>=2.0.1; extra == "all"
 Requires-Dist: typing_extensions~=4.15; extra == "all"
-Requires-Dist: sphinx_reports~=0.10.0; extra == "all"
-Requires-Dist: pytest~=9.0; extra == "all"
-Requires-Dist: sphinx_design~=0.7.0; extra == "all"
-Requires-Dist: pyTooling~=8.14; extra == "all"
+Requires-Dist: sphinx_reports~=0.11.0; extra == "all"
+Requires-Dist: lxml<7.0,>=5.4; extra == "all"
+Requires-Dist: sphinx_autodoc_typehints~=3.11; extra == "all"
 Requires-Dist: sphinx_rtd_theme~=3.1; extra == "all"
+Requires-Dist: sphinxcontrib-mermaid~=2.0; extra == "all"
+Requires-Dist: pyTooling~=8.14; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -85,7 +85,7 @@ Dynamic: summary
 [![Sourcecode on GitHub](https://img.shields.io/badge/VHDL-pyVHDLModel-29b6f6?longCache=true&style=flat-square&logo=GitHub&labelColor=0277bd)](https://github.com/vhdl/pyVHDLModel)
 [![Sourcecode License](https://img.shields.io/pypi/l/pyVHDLModel?longCache=true&style=flat-square&logo=Apache&label=code)](LICENSE.md)
 [![Documentation](https://img.shields.io/website?longCache=true&style=flat-square&label=vhdl.github.io%2FpyVHDLModel&logo=GitHub&logoColor=fff&up_color=blueviolet&up_message=Read%20now%20%E2%9E%9A&url=https%3A%2F%2Fvhdl.github.io%2FpyVHDLModel%2Findex.html)](https://vhdl.github.io/pyVHDLModel/)
-[![Documentation License](https://img.shields.io/badge/doc-CC--BY%204.0-green?longCache=true&style=flat-square&logo=CreativeCommons&logoColor=fff)](LICENSE.md)
+[![Documentation License](https://img.shields.io/badge/doc-CC--BY%204.0-green?longCache=true&style=flat-square&logo=CreativeCommons&logoColor=fff)](doc/Doc-License.rst)
 [![Gitter](https://img.shields.io/badge/chat-on%20gitter-4db797?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef)](https://gitter.im/hdl/community)  
 [![PyPI](https://img.shields.io/pypi/v/pyVHDLModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072)](https://pypi.org/project/pyVHDLModel/)
 ![PyPI - Status](https://img.shields.io/pypi/status/pyVHDLModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072)
@@ -120,6 +120,7 @@ on such a model, while supporting multiple frontends.
 
 * High-level API for [GHDL's](https://GitHub.com/ghdl/ghdl) `libghdl` offered via `pyghdl`.
 * Code Document-Object-Model (Code-DOM) in [pyVHDLParser](https://GitHub.com/Paebbels/pyVHDLParser).
+* [PyHDLio](https://github.com/amb5l/PyHDLio) based on an ANTLR4 grammar.
 * [pyVHDLModelTreesitter](https://gitlab.com/dawalters/pyVHDLModelTreesitter) based on [tree-sitter-vhdl](https://github.com/jpt13653903/tree-sitter-vhdl).
 
 ## pyVHDLModel Consumers
@@ -169,7 +170,7 @@ for entity in document.Entities.values():
 
 # License
 
-This Python package (source code) licensed under [Apache License 2.0](LICENSE.md).  
+This Python package (source code) is licensed under [Apache License 2.0](LICENSE.md).  
 The accompanying documentation is licensed under [Creative Commons - Attribution 4.0 (CC-BY 4.0)](doc/Doc-License.rst).
 
 -------------------------

{pyvhdlmodel-0.34.0 → pyvhdlmodel-0.35.0}/README.md

@@ -5,7 +5,7 @@
 [![Sourcecode on GitHub](https://img.shields.io/badge/VHDL-pyVHDLModel-29b6f6?longCache=true&style=flat-square&logo=GitHub&labelColor=0277bd)](https://github.com/vhdl/pyVHDLModel)
 [![Sourcecode License](https://img.shields.io/pypi/l/pyVHDLModel?longCache=true&style=flat-square&logo=Apache&label=code)](LICENSE.md)
 [![Documentation](https://img.shields.io/website?longCache=true&style=flat-square&label=vhdl.github.io%2FpyVHDLModel&logo=GitHub&logoColor=fff&up_color=blueviolet&up_message=Read%20now%20%E2%9E%9A&url=https%3A%2F%2Fvhdl.github.io%2FpyVHDLModel%2Findex.html)](https://vhdl.github.io/pyVHDLModel/)
-[![Documentation License](https://img.shields.io/badge/doc-CC--BY%204.0-green?longCache=true&style=flat-square&logo=CreativeCommons&logoColor=fff)](LICENSE.md)
+[![Documentation License](https://img.shields.io/badge/doc-CC--BY%204.0-green?longCache=true&style=flat-square&logo=CreativeCommons&logoColor=fff)](doc/Doc-License.rst)
 [![Gitter](https://img.shields.io/badge/chat-on%20gitter-4db797?longCache=true&style=flat-square&logo=gitter&logoColor=e8ecef)](https://gitter.im/hdl/community)  
 [![PyPI](https://img.shields.io/pypi/v/pyVHDLModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072)](https://pypi.org/project/pyVHDLModel/)
 ![PyPI - Status](https://img.shields.io/pypi/status/pyVHDLModel?longCache=true&style=flat-square&logo=PyPI&logoColor=FBE072)
@@ -40,6 +40,7 @@ on such a model, while supporting multiple frontends.
 
 * High-level API for [GHDL's](https://GitHub.com/ghdl/ghdl) `libghdl` offered via `pyghdl`.
 * Code Document-Object-Model (Code-DOM) in [pyVHDLParser](https://GitHub.com/Paebbels/pyVHDLParser).
+* [PyHDLio](https://github.com/amb5l/PyHDLio) based on an ANTLR4 grammar.
 * [pyVHDLModelTreesitter](https://gitlab.com/dawalters/pyVHDLModelTreesitter) based on [tree-sitter-vhdl](https://github.com/jpt13653903/tree-sitter-vhdl).
 
 ## pyVHDLModel Consumers
@@ -89,7 +90,7 @@ for entity in document.Entities.values():
 
 # License
 
-This Python package (source code) licensed under [Apache License 2.0](LICENSE.md).  
+This Python package (source code) is licensed under [Apache License 2.0](LICENSE.md).  
 The accompanying documentation is licensed under [Creative Commons - Attribution 4.0 (CC-BY 4.0)](doc/Doc-License.rst).
 
 -------------------------

{pyvhdlmodel-0.34.0 → pyvhdlmodel-0.35.0}/pyVHDLModel/Base.py

@@ -137,13 +137,13 @@ class ModelEntity(metaclass=ExtendedType, slots=True):
 @export
 class NamedEntityMixin(metaclass=ExtendedType, mixin=True):
 	"""
-	A ``NamedEntityMixin`` is a mixin class for all VHDL entities that have identifiers.
+	A ``NamedEntityMixin`` is a mixin class for all VHDL entities that have an identifier.
 
 	Protected variables :attr:`_identifier` and :attr:`_normalizedIdentifier` are available to derived classes as well as
 	two readonly properties :attr:`Identifier` and :attr:`NormalizedIdentifier` for public access.
 	"""
 
-	_identifier: str            #: The identifier of a model entity.
+	_identifier:           str  #: The identifier of a model entity.
 	_normalizedIdentifier: str  #: The normalized (lower case) identifier of a model entity.
 
 	def __init__(self, identifier: str) -> None:
@@ -174,6 +174,46 @@ class NamedEntityMixin(metaclass=ExtendedType, mixin=True):
 		return self._normalizedIdentifier
 
 
+@export
+class OptionallyNamedEntityMixin(metaclass=ExtendedType, mixin=True):
+	"""
+	A ``OptionallyNamedEntityMixin`` is a mixin class for all VHDL entities that have an optional identifier.
+
+	Protected variables :attr:`_identifier` and :attr:`_normalizedIdentifier` are available to derived classes as well as
+	two readonly properties :attr:`Identifier` and :attr:`NormalizedIdentifier` for public access.
+	"""
+
+	_identifier:           Nullable[str]  #: The identifier of a model entity.
+	_normalizedIdentifier: Nullable[str]  #: The normalized (lower case) identifier of a model entity.
+
+	def __init__(self, identifier: Nullable[str]) -> None:
+		"""
+		Initializes a named entity.
+
+		:param identifier: Identifier (name) of the model entity.
+		"""
+		self._identifier = identifier
+		self._normalizedIdentifier = identifier.lower() if identifier is not None else None
+
+	@readonly
+	def Identifier(self) -> Nullable[str]:
+		"""
+		Returns a model entity's identifier (name).
+
+		:returns: Name of a model entity.
+		"""
+		return self._identifier
+
+	@readonly
+	def NormalizedIdentifier(self) -> Nullable[str]:
+		"""
+		Returns a model entity's normalized identifier (lower case name).
+
+		:returns: Normalized name of a model entity.
+		"""
+		return self._normalizedIdentifier
+
+
 @export
 class MultipleNamedEntityMixin(metaclass=ExtendedType, mixin=True):
 	"""
@@ -401,7 +441,7 @@ class Range(ModelEntity):
 	_rightBound: ExpressionUnion
 	_direction:  Direction
 
-	def __init__(self, leftBound: ExpressionUnion, rightBound: ExpressionUnion, direction: Direction, parent: ModelEntity = None) -> None:
+	def __init__(self, leftBound: ExpressionUnion, rightBound: ExpressionUnion, direction: Direction, parent: Nullable[ModelEntity] = None) -> None:
 		super().__init__(parent)
 
 		self._leftBound = leftBound
@@ -433,7 +473,7 @@ class WaveformElement(ModelEntity):
 	_expression: ExpressionUnion
 	_after: ExpressionUnion
 
-	def __init__(self, expression: ExpressionUnion, after: Nullable[ExpressionUnion] = None, parent: ModelEntity = None) -> None:
+	def __init__(self, expression: ExpressionUnion, after: Nullable[ExpressionUnion] = None, parent: Nullable[ModelEntity] = None) -> None:
 		super().__init__(parent)
 
 		self._expression = expression

{pyvhdlmodel-0.34.0 → pyvhdlmodel-0.35.0}/pyVHDLModel/Concurrent.py

@@ -138,7 +138,7 @@ class Instantiation(ConcurrentStatement):
 		label: str,
 		genericAssociations: Nullable[Iterable[AssociationItem]] = None,
 		portAssociations: Nullable[Iterable[AssociationItem]] = None,
-		parent: ModelEntity = None
+		parent: Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, parent)
 
@@ -185,7 +185,7 @@ class ComponentInstantiation(Instantiation):
 		componentSymbol: ComponentInstantiationSymbol,
 		genericAssociations: Nullable[Iterable[AssociationItem]] = None,
 		portAssociations: Nullable[Iterable[AssociationItem]] = None,
-		parent: ModelEntity = None
+		parent: Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, genericAssociations, portAssociations, parent)
 
@@ -219,7 +219,7 @@ class EntityInstantiation(Instantiation):
 		architectureSymbol: Nullable[ArchitectureSymbol] = None,
 		genericAssociations: Nullable[Iterable[AssociationItem]] = None,
 		portAssociations: Nullable[Iterable[AssociationItem]] = None,
-		parent: ModelEntity = None
+		parent: Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, genericAssociations, portAssociations, parent)
 
@@ -259,7 +259,7 @@ class ConfigurationInstantiation(Instantiation):
 		configurationSymbol: ConfigurationInstantiationSymbol,
 		genericAssociations: Nullable[Iterable[AssociationItem]] = None,
 		portAssociations: Nullable[Iterable[AssociationItem]] = None,
-		parent: ModelEntity = None
+		parent: Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, genericAssociations, portAssociations, parent)
 
@@ -296,7 +296,7 @@ class ProcessStatement(ConcurrentStatement, SequentialDeclarationsMixin, Sequent
 		statements: Nullable[Iterable[SequentialStatement]] = None,
 		sensitivityList: Nullable[Iterable[Name]] = None,
 		documentation: Nullable[str] = None,
-		parent: ModelEntity = None
+		parent: Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, parent)
 		SequentialDeclarationsMixin.__init__(self, declaredItems)
@@ -323,7 +323,7 @@ class ConcurrentProcedureCall(ConcurrentStatement, ProcedureCallMixin):
 		label: str,
 		procedureName: Name,
 		parameterMappings: Nullable[Iterable[ParameterAssociationItem]] = None,
-		parent: ModelEntity = None
+		parent: Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, parent)
 		ProcedureCallMixin.__init__(self, procedureName, parameterMappings)
@@ -341,7 +341,7 @@ class ConcurrentBlockStatement(ConcurrentStatement, BlockStatementMixin, Labeled
 		statements:    Iterable['ConcurrentStatement'] = None,
 		documentation: Nullable[str] = None,
 		allowBlackbox: Nullable[bool] = None,
-		parent:        ModelEntity = None
+		parent:        Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, parent)
 		BlockStatementMixin.__init__(self)
@@ -386,7 +386,7 @@ class GenerateBranch(ModelEntity, ConcurrentDeclarationRegionMixin, ConcurrentSt
 		statements:       Nullable[Iterable[ConcurrentStatement]] = None,
 		alternativeLabel: Nullable[str] = None,
 		allowBlackbox:    Nullable[bool] = None,
-		parent:           ModelEntity = None
+		parent:           Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(parent)
 		ConcurrentDeclarationRegionMixin.__init__(self, declaredItems)
@@ -434,7 +434,7 @@ class IfGenerateBranch(GenerateBranch, IfBranchMixin):
 		statements:       Nullable[Iterable[ConcurrentStatement]] = None,
 		alternativeLabel: Nullable[str] = None,
 		allowBlackbox:    Nullable[bool] = None,
-		parent:           ModelEntity = None
+		parent:           Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(declaredItems, statements, alternativeLabel, allowBlackbox, parent)
 		IfBranchMixin.__init__(self, condition)
@@ -467,7 +467,7 @@ class ElsifGenerateBranch(GenerateBranch, ElsifBranchMixin):
 		statements:       Nullable[Iterable[ConcurrentStatement]] = None,
 		alternativeLabel: Nullable[str] = None,
 		allowBlackbox:    Nullable[bool] = None,
-		parent:           ModelEntity = None
+		parent:           Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(declaredItems, statements, alternativeLabel, allowBlackbox, parent)
 		ElsifBranchMixin.__init__(self, condition)
@@ -499,7 +499,7 @@ class ElseGenerateBranch(GenerateBranch, ElseBranchMixin):
 		statements:       Nullable[Iterable[ConcurrentStatement]] = None,
 		alternativeLabel: Nullable[str] = None,
 		allowBlackbox:    Nullable[bool] = None,
-		parent:           ModelEntity = None
+		parent:           Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(declaredItems, statements, alternativeLabel, allowBlackbox, parent)
 		ElseBranchMixin.__init__(self)
@@ -523,7 +523,7 @@ class GenerateStatement(ConcurrentStatement, AllowBlackboxMixin):
 		self,
 		label:         Nullable[str] = None,
 		allowBlackbox: Nullable[bool] = None,
-		parent:        ModelEntity = None
+		parent:        Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, parent)
 		AllowBlackboxMixin.__init__(self, allowBlackbox)
@@ -575,7 +575,7 @@ class IfGenerateStatement(GenerateStatement):
 		elsifBranches: Nullable[Iterable[ElsifGenerateBranch]] = None,
 		elseBranch:    Nullable[ElseGenerateBranch] = None,
 		allowBlackbox: Nullable[bool] = None,
-		parent:        ModelEntity = None
+		parent:        Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, allowBlackbox, parent)
 
@@ -630,7 +630,7 @@ class ConcurrentChoice(BaseChoice):
 class IndexedGenerateChoice(ConcurrentChoice):
 	_expression: ExpressionUnion
 
-	def __init__(self, expression: ExpressionUnion, parent: ModelEntity = None) -> None:
+	def __init__(self, expression: ExpressionUnion, parent: Nullable[ModelEntity] = None) -> None:
 		super().__init__(parent)
 
 		self._expression = expression
@@ -648,7 +648,7 @@ class IndexedGenerateChoice(ConcurrentChoice):
 class RangedGenerateChoice(ConcurrentChoice):
 	_range: 'Range'
 
-	def __init__(self, rng: 'Range', parent: ModelEntity = None) -> None:
+	def __init__(self, rng: 'Range', parent: Nullable[ModelEntity] = None) -> None:
 		super().__init__(parent)
 
 		self._range = rng
@@ -670,7 +670,7 @@ class ConcurrentCase(BaseCase, LabeledEntityMixin, ConcurrentDeclarationRegionMi
 		statements:       Nullable[Iterable[ConcurrentStatement]] = None,
 		alternativeLabel: Nullable[str] = None,
 		allowBlackbox:    Nullable[bool] = None,
-		parent:           ModelEntity = None
+		parent:           Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(parent)
 		LabeledEntityMixin.__init__(self, alternativeLabel)
@@ -690,7 +690,7 @@ class GenerateCase(ConcurrentCase):
 		statements:       Nullable[Iterable[ConcurrentStatement]] = None,
 		alternativeLabel: Nullable[str] = None,
 		allowBlackbox:    Nullable[bool] = None,
-		parent:           ModelEntity = None
+		parent:           Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(declaredItems, statements, alternativeLabel, allowBlackbox, parent)
 
@@ -744,7 +744,7 @@ class CaseGenerateStatement(GenerateStatement):
 		expression:    ExpressionUnion,
 		cases:         Iterable[ConcurrentCase],
 		allowBlackbox: Nullable[bool] = None,
-		parent:        ModelEntity = None
+		parent:        Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, allowBlackbox, parent)
 
@@ -800,7 +800,7 @@ class ForGenerateStatement(GenerateStatement, ConcurrentDeclarationRegionMixin,
 		declaredItems: Nullable[Iterable] = None,
 		statements:    Nullable[Iterable[ConcurrentStatement]] = None,
 		allowBlackbox: Nullable[bool] = None,
-		parent:        ModelEntity = None
+		parent:        Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, allowBlackbox, parent)
 		ConcurrentDeclarationRegionMixin.__init__(self, declaredItems)
@@ -842,7 +842,7 @@ class ConcurrentSignalAssignment(ConcurrentStatement, SignalAssignmentMixin):
 	   * :class:`~pyVHDLModel.Concurrent.ConcurrentSelectedSignalAssignment`
 	   * :class:`~pyVHDLModel.Concurrent.ConcurrentConditionalSignalAssignment`
 	"""
-	def __init__(self, label: str, target: Name, parent: ModelEntity = None) -> None:
+	def __init__(self, label: str, target: Name, parent: Nullable[ModelEntity] = None) -> None:
 		super().__init__(label, parent)
 		SignalAssignmentMixin.__init__(self, target)
 
@@ -851,7 +851,7 @@ class ConcurrentSignalAssignment(ConcurrentStatement, SignalAssignmentMixin):
 class ConcurrentSimpleSignalAssignment(ConcurrentSignalAssignment):
 	_waveform: List[WaveformElement]
 
-	def __init__(self, label: str, target: Name, waveform: Iterable[WaveformElement], parent: ModelEntity = None) -> None:
+	def __init__(self, label: str, target: Name, waveform: Iterable[WaveformElement], parent: Nullable[ModelEntity] = None) -> None:
 		super().__init__(label, target, parent)
 
 		# TODO: extract to mixin
@@ -868,13 +868,13 @@ class ConcurrentSimpleSignalAssignment(ConcurrentSignalAssignment):
 
 @export
 class ConcurrentSelectedSignalAssignment(ConcurrentSignalAssignment):
-	def __init__(self, label: str, target: Name, expression: ExpressionUnion, parent: ModelEntity = None) -> None:
+	def __init__(self, label: str, target: Name, expression: ExpressionUnion, parent: Nullable[ModelEntity] = None) -> None:
 		super().__init__(label, target, parent)
 
 
 @export
 class ConcurrentConditionalSignalAssignment(ConcurrentSignalAssignment):
-	def __init__(self, label: str, target: Name, expression: ExpressionUnion, parent: ModelEntity = None) -> None:
+	def __init__(self, label: str, target: Name, expression: ExpressionUnion, parent: Nullable[ModelEntity] = None) -> None:
 		super().__init__(label, target, parent)
 
 
@@ -886,7 +886,7 @@ class ConcurrentAssertStatement(ConcurrentStatement, AssertStatementMixin):
 		message: ExpressionUnion,
 		severity: Nullable[ExpressionUnion] = None,
 		label: Nullable[str] = None,
-		parent: ModelEntity = None
+		parent: Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, parent)
 		AssertStatementMixin.__init__(self, condition, message, severity)

{pyvhdlmodel-0.34.0 → pyvhdlmodel-0.35.0}/pyVHDLModel/Declaration.py

@@ -103,7 +103,7 @@ class Attribute(ModelEntity, NamedEntityMixin, DocumentedEntityMixin):
 		identifier: str,
 		subtype: Symbol,
 		documentation: Nullable[str] = None,
-		parent: ModelEntity = None
+		parent: Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(parent)
 		NamedEntityMixin.__init__(self, identifier)
@@ -141,7 +141,7 @@ class AttributeSpecification(ModelEntity, DocumentedEntityMixin):
 		entityClass: EntityClass,
 		expression: ExpressionUnion,
 		documentation: Nullable[str] = None,
-		parent: ModelEntity = None
+		parent: Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(parent)
 		DocumentedEntityMixin.__init__(self, documentation)
@@ -179,7 +179,7 @@ class AttributeSpecification(ModelEntity, DocumentedEntityMixin):
 # TODO: move somewhere else
 @export
 class Alias(ModelEntity, NamedEntityMixin, DocumentedEntityMixin):
-	def __init__(self, identifier: str, documentation: Nullable[str] = None, parent: ModelEntity = None) -> None:
+	def __init__(self, identifier: str, documentation: Nullable[str] = None, parent: Nullable[ModelEntity] = None) -> None:
 		"""
 		Initializes underlying ``BaseType``.
 

{pyvhdlmodel-0.34.0 → pyvhdlmodel-0.35.0}/pyVHDLModel/DesignUnit.py

@@ -46,7 +46,7 @@ from pyVHDLModel.Base       import ModelEntity, NamedEntityMixin, DocumentedEnti
 from pyVHDLModel.Namespace  import Namespace
 from pyVHDLModel.Regions    import ConcurrentDeclarationRegionMixin
 from pyVHDLModel.Symbol     import Symbol, PackageSymbol, EntitySymbol, LibraryReferenceSymbol
-from pyVHDLModel.Interface  import GenericInterfaceItemMixin, PortInterfaceItemMixin
+from pyVHDLModel.Interface  import GenericInterfaceItemMixin, PortInterfaceItemMixin, WithGenericsMixin, WithPortsMixin
 from pyVHDLModel.Object     import DeferredConstant
 from pyVHDLModel.Concurrent import ConcurrentStatement, ConcurrentStatementsMixin
 
@@ -65,7 +65,7 @@ class Reference(ModelEntity):
 
 	_symbols:       List[Symbol]
 
-	def __init__(self, symbols: Iterable[Symbol], parent: ModelEntity = None) -> None:
+	def __init__(self, symbols: Iterable[Symbol], parent: Nullable[ModelEntity] = None) -> None:
 		"""
 		Initializes a reference by taking a list of symbols and a parent reference.
 
@@ -187,7 +187,7 @@ class DesignUnit(ModelEntity, NamedEntityMixin, DocumentedEntityMixin):
 
 	_namespace:           'Namespace'
 
-	def __init__(self, identifier: str, contextItems: Nullable[Iterable[ContextUnion]] = None, documentation: Nullable[str] = None, parent: ModelEntity = None) -> None:
+	def __init__(self, identifier: str, contextItems: Nullable[Iterable[ContextUnion]] = None, documentation: Nullable[str] = None, parent: Nullable[ModelEntity] = None) -> None:
 		"""
 		Initializes a design unit.
 
@@ -373,7 +373,7 @@ class Context(PrimaryUnit):
 
 	_references:        List[ContextUnion]
 
-	def __init__(self, identifier: str, references: Nullable[Iterable[ContextUnion]] = None, documentation: Nullable[str] = None, parent: ModelEntity = None) -> None:
+	def __init__(self, identifier: str, references: Nullable[Iterable[ContextUnion]] = None, documentation: Nullable[str] = None, parent: Nullable[ModelEntity] = None) -> None:
 		super().__init__(identifier, None, documentation, parent)
 
 		self._references = []
@@ -414,7 +414,7 @@ class Context(PrimaryUnit):
 
 
 @export
-class Package(PrimaryUnit, DesignUnitWithContextMixin, ConcurrentDeclarationRegionMixin, AllowBlackboxMixin):
+class Package(PrimaryUnit, DesignUnitWithContextMixin, WithGenericsMixin, ConcurrentDeclarationRegionMixin, AllowBlackboxMixin):
 	"""
 	Represents a package declaration.
 
@@ -429,8 +429,6 @@ class Package(PrimaryUnit, DesignUnitWithContextMixin, ConcurrentDeclarationRegi
 
 	_packageBody:       Nullable["PackageBody"]
 
-	_genericItems:      List[GenericInterfaceItemMixin]
-
 	_deferredConstants: Dict[str, DeferredConstant]
 	_components:        Dict[str, 'Component']
 
@@ -442,7 +440,7 @@ class Package(PrimaryUnit, DesignUnitWithContextMixin, ConcurrentDeclarationRegi
 		declaredItems: Nullable[Iterable] = None,
 		documentation: Nullable[str] = None,
 		allowBlackbox: Nullable[bool] = None,
-		parent:        ModelEntity = None
+		parent:        Nullable[ModelEntity] = None
 	) -> None:
 		"""
 		Initialize a package.
@@ -457,18 +455,12 @@ class Package(PrimaryUnit, DesignUnitWithContextMixin, ConcurrentDeclarationRegi
 		"""
 		super().__init__(identifier, contextItems, documentation, parent)
 		DesignUnitWithContextMixin.__init__(self)
+		WithGenericsMixin.__init__(self, genericItems)
 		ConcurrentDeclarationRegionMixin.__init__(self, declaredItems)
 		AllowBlackboxMixin.__init__(self, allowBlackbox)
 
 		self._packageBody = None
 
-		# TODO: extract to mixin
-		self._genericItems = []  # TODO: convert to dict
-		if genericItems is not None:
-			for generic in genericItems:
-				self._genericItems.append(generic)
-				generic._parent = self
-
 		self._deferredConstants = {}
 		self._components = {}
 
@@ -476,10 +468,6 @@ class Package(PrimaryUnit, DesignUnitWithContextMixin, ConcurrentDeclarationRegi
 	def PackageBody(self) -> Nullable["PackageBody"]:
 		return self._packageBody
 
-	@property
-	def GenericItems(self) -> List[GenericInterfaceItemMixin]:
-		return self._genericItems
-
 	@property
 	def DeclaredItems(self) -> List:
 		return self._declaredItems
@@ -534,7 +522,7 @@ class PackageBody(SecondaryUnit, DesignUnitWithContextMixin, ConcurrentDeclarati
 		contextItems: Nullable[Iterable[ContextUnion]] = None,
 		declaredItems: Nullable[Iterable] = None,
 		documentation: Nullable[str] = None,
-		parent: ModelEntity = None
+		parent: Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(packageSymbol.Name.Identifier, contextItems, documentation, parent)
 		DesignUnitWithContextMixin.__init__(self)
@@ -566,7 +554,7 @@ class PackageBody(SecondaryUnit, DesignUnitWithContextMixin, ConcurrentDeclarati
 
 
 @export
-class Entity(PrimaryUnit, DesignUnitWithContextMixin, ConcurrentDeclarationRegionMixin, ConcurrentStatementsMixin, AllowBlackboxMixin):
+class Entity(PrimaryUnit, DesignUnitWithContextMixin, WithGenericsMixin, WithPortsMixin, ConcurrentDeclarationRegionMixin, ConcurrentStatementsMixin, AllowBlackboxMixin):
 	"""
 	Represents an entity declaration.
 
@@ -579,9 +567,6 @@ class Entity(PrimaryUnit, DesignUnitWithContextMixin, ConcurrentDeclarationRegio
 	      end entity;
 	"""
 
-	_genericItems:  List[GenericInterfaceItemMixin]
-	_portItems:     List[PortInterfaceItemMixin]
-
 	_architectures: Dict[str, 'Architecture']
 
 	def __init__(
@@ -594,40 +579,18 @@ class Entity(PrimaryUnit, DesignUnitWithContextMixin, ConcurrentDeclarationRegio
 		statements:    Nullable[Iterable[ConcurrentStatement]] = None,
 		documentation: Nullable[str] = None,
 		allowBlackbox: Nullable[bool] = None,
-		parent:        ModelEntity = None
+		parent:        Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(identifier, contextItems, documentation, parent)
 		DesignUnitWithContextMixin.__init__(self)
+		WithGenericsMixin.__init__(self, genericItems)
+		WithPortsMixin.__init__(self, portItems)
 		ConcurrentDeclarationRegionMixin.__init__(self, declaredItems)
 		ConcurrentStatementsMixin.__init__(self, statements)
 		AllowBlackboxMixin.__init__(self, allowBlackbox)
 
-		# TODO: extract to mixin
-		self._genericItems = []
-		if genericItems is not None:
-			for item in genericItems:
-				self._genericItems.append(item)
-				item._parent = self
-
-		# TODO: extract to mixin
-		self._portItems = []
-		if portItems is not None:
-			for item in portItems:
-				self._portItems.append(item)
-				item._parent = self
-
 		self._architectures = {}
 
-	# TODO: extract to mixin for generics
-	@property
-	def GenericItems(self) -> List[GenericInterfaceItemMixin]:
-		return self._genericItems
-
-	# TODO: extract to mixin for ports
-	@property
-	def PortItems(self) -> List[PortInterfaceItemMixin]:
-		return self._portItems
-
 	@property
 	def Architectures(self) -> Dict[str, 'Architecture']:
 		return self._architectures
@@ -672,7 +635,7 @@ class Architecture(SecondaryUnit, DesignUnitWithContextMixin, ConcurrentDeclarat
 		statements:    Iterable['ConcurrentStatement'] = None,
 		documentation: Nullable[str] = None,
 		allowBlackbox: Nullable[bool] = None,
-		parent:        ModelEntity = None
+		parent:        Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(identifier, contextItems, documentation, parent)
 		DesignUnitWithContextMixin.__init__(self)
@@ -728,7 +691,7 @@ class Component(ModelEntity, NamedEntityMixin, DocumentedEntityMixin, AllowBlack
 		portItems:     Nullable[Iterable[PortInterfaceItemMixin]] = None,
 		documentation: Nullable[str] = None,
 		allowBlackbox: Nullable[bool] = None,
-		parent:        ModelEntity = None
+		parent:        Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(parent)
 		NamedEntityMixin.__init__(self, identifier)
@@ -811,7 +774,7 @@ class Configuration(PrimaryUnit, DesignUnitWithContextMixin):
 		identifier: str,
 		contextItems: Nullable[Iterable[Context]] = None,
 		documentation: Nullable[str] = None,
-		parent: ModelEntity = None
+		parent: Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(identifier, contextItems, documentation, parent)
 		DesignUnitWithContextMixin.__init__(self)