pyVHDLModel 0.36.0__tar.gz → 0.37.0__tar.gz

{pyvhdlmodel-0.36.0 → pyvhdlmodel-0.37.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyVHDLModel
-Version: 0.36.0
+Version: 0.37.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.15
 Provides-Extra: doc
-Requires-Dist: sphinx_autodoc_typehints~=3.11; extra == "doc"
-Requires-Dist: sphinx~=9.1; extra == "doc"
-Requires-Dist: pyTooling~=8.15; extra == "doc"
-Requires-Dist: sphinx_design~=0.7.0; extra == "doc"
+Requires-Dist: autoapi>=2.0.1; extra == "doc"
+Requires-Dist: sphinx-copybutton>=0.5.2; extra == "doc"
 Requires-Dist: sphinxcontrib-mermaid~=2.0; extra == "doc"
-Requires-Dist: sphinx_reports~=0.11.0; extra == "doc"
+Requires-Dist: sphinx_design~=0.7.0; extra == "doc"
+Requires-Dist: sphinx_autodoc_typehints~=3.12; extra == "doc"
 Requires-Dist: sphinx_rtd_theme~=3.1; extra == "doc"
+Requires-Dist: pyTooling~=8.15; extra == "doc"
+Requires-Dist: sphinx~=9.1; extra == "doc"
+Requires-Dist: sphinx_reports~=0.11.0; extra == "doc"
 Requires-Dist: docutils_stubs~=0.0.22; extra == "doc"
-Requires-Dist: autoapi>=2.0.1; extra == "doc"
-Requires-Dist: sphinx-copybutton>=0.5.2; extra == "doc"
 Provides-Extra: test
-Requires-Dist: lxml<7.0,>=6.1; extra == "test"
 Requires-Dist: mypy[reports]~=2.1; extra == "test"
-Requires-Dist: pytest~=9.0; extra == "test"
-Requires-Dist: pyTooling~=8.15; extra == "test"
+Requires-Dist: typing_extensions~=4.16; extra == "test"
+Requires-Dist: pytest~=9.1; extra == "test"
 Requires-Dist: pytest-cov~=7.1; extra == "test"
-Requires-Dist: typing_extensions~=4.15; extra == "test"
-Requires-Dist: Coverage~=7.14; extra == "test"
+Requires-Dist: pyTooling~=8.15; extra == "test"
+Requires-Dist: lxml<7.0,>=6.1; extra == "test"
+Requires-Dist: Coverage~=7.15; extra == "test"
 Provides-Extra: all
-Requires-Dist: lxml<7.0,>=6.1; extra == "all"
-Requires-Dist: sphinx_autodoc_typehints~=3.11; extra == "all"
-Requires-Dist: sphinx~=9.1; extra == "all"
 Requires-Dist: mypy[reports]~=2.1; extra == "all"
-Requires-Dist: pytest~=9.0; extra == "all"
-Requires-Dist: pyTooling~=8.15; extra == "all"
-Requires-Dist: sphinx_design~=0.7.0; extra == "all"
+Requires-Dist: typing_extensions~=4.16; extra == "all"
+Requires-Dist: autoapi>=2.0.1; extra == "all"
+Requires-Dist: sphinx-copybutton>=0.5.2; extra == "all"
 Requires-Dist: sphinxcontrib-mermaid~=2.0; extra == "all"
-Requires-Dist: sphinx_reports~=0.11.0; extra == "all"
-Requires-Dist: pytest-cov~=7.1; extra == "all"
+Requires-Dist: sphinx_design~=0.7.0; extra == "all"
+Requires-Dist: pytest~=9.1; extra == "all"
 Requires-Dist: sphinx_rtd_theme~=3.1; extra == "all"
+Requires-Dist: sphinx~=9.1; extra == "all"
+Requires-Dist: pytest-cov~=7.1; extra == "all"
+Requires-Dist: pyTooling~=8.15; extra == "all"
+Requires-Dist: lxml<7.0,>=6.1; extra == "all"
+Requires-Dist: Coverage~=7.15; extra == "all"
+Requires-Dist: sphinx_autodoc_typehints~=3.12; extra == "all"
+Requires-Dist: sphinx_reports~=0.11.0; extra == "all"
 Requires-Dist: docutils_stubs~=0.0.22; extra == "all"
-Requires-Dist: autoapi>=2.0.1; extra == "all"
-Requires-Dist: typing_extensions~=4.15; extra == "all"
-Requires-Dist: sphinx-copybutton>=0.5.2; extra == "all"
-Requires-Dist: Coverage~=7.14; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{pyvhdlmodel-0.36.0 → pyvhdlmodel-0.37.0}/pyVHDLModel/Association.py

@@ -67,7 +67,7 @@ class AssociationItem(ModelEntity):
 
 		self._formal = formal
 		if formal is not None:
-			formal._parent = self
+			formal.Parent = self
 
 		self._actual = actual
 		# actual._parent = self  # FIXME: actual is provided as None

{pyvhdlmodel-0.36.0 → pyvhdlmodel-0.37.0}/pyVHDLModel/Base.py

@@ -117,15 +117,22 @@ class ModelEntity(metaclass=ExtendedType, slots=True):
 		"""
 		self._parent = parent
 
-	@readonly
+	@property
 	def Parent(self) -> 'ModelEntity':
 		"""
-		Read-only property to access the model entity's parent element reference in a logical hierarchy (:attr:`_parent`).
+		Property to access the model entity's parent element reference in a logical hierarchy (:attr:`_parent`).
 
 		:returns: Reference to the parent entity.
 		"""
 		return self._parent
 
+	@Parent.setter
+	def Parent(self, parent: 'ModelEntity') -> None:
+		if parent is None:
+			raise ValueError("Parameter 'parent' is None.")
+
+		self._parent = parent
+
 	def GetAncestor(self, type: Type) -> 'ModelEntity':
 		parent = self._parent
 		while not isinstance(parent, type):
@@ -339,7 +346,7 @@ class ConditionalMixin(metaclass=ExtendedType, mixin=True):
 		"""
 		self._condition = condition
 		if condition is not None:
-			condition._parent = self
+			condition.Parent = self
 
 	@readonly
 	def Condition(self) -> ExpressionUnion:
@@ -392,11 +399,11 @@ class ReportStatementMixin(metaclass=ExtendedType, mixin=True):
 	def __init__(self, message: Nullable[ExpressionUnion] = None, severity: Nullable[ExpressionUnion] = None) -> None:
 		self._message = message
 		if message is not None:
-			message._parent = self
+			message.Parent = self
 
 		self._severity = severity
 		if severity is not None:
-			severity._parent = self
+			severity.Parent = self
 
 	@property
 	def Message(self) -> Nullable[ExpressionUnion]:
@@ -445,10 +452,10 @@ class Range(ModelEntity):
 		super().__init__(parent)
 
 		self._leftBound = leftBound
-		leftBound._parent = self
+		leftBound.Parent = self
 
 		self._rightBound = rightBound
-		rightBound._parent = self
+		rightBound.Parent = self
 
 		self._direction = direction
 
@@ -477,11 +484,11 @@ class WaveformElement(ModelEntity):
 		super().__init__(parent)
 
 		self._expression = expression
-		expression._parent = self
+		expression.Parent = self
 
 		self._after = after
 		if after is not None:
-			after._parent = self
+			after.Parent = self
 
 	@property
 	def Expression(self) -> ExpressionUnion:

{pyvhdlmodel-0.36.0 → pyvhdlmodel-0.37.0}/pyVHDLModel/Common.py

@@ -101,14 +101,14 @@ class ProcedureCallMixin(metaclass=ExtendedType, mixin=True):
 
 	def __init__(self, procedureName: Symbol, parameterMappings: Nullable[Iterable[ParameterAssociationItem]] = None) -> None:
 		self._procedure = procedureName
-		procedureName._parent = self
+		procedureName.Parent = self
 
 		# TODO: extract to mixin
 		self._parameterMappings = []
 		if parameterMappings is not None:
 			for parameterMapping in parameterMappings:
 				self._parameterMappings.append(parameterMapping)
-				parameterMapping._parent = self
+				parameterMapping.Parent = self
 
 	@readonly
 	def Procedure(self) -> Symbol:
@@ -127,7 +127,7 @@ class AssignmentMixin(metaclass=ExtendedType, mixin=True):
 
 	def __init__(self, target: Symbol) -> None:
 		self._target = target
-		target._parent = self
+		target.Parent = self
 
 	@property
 	def Target(self) -> Symbol:
@@ -150,7 +150,7 @@ class VariableAssignmentMixin(AssignmentMixin, mixin=True):
 		super().__init__(target)
 
 		self._expression = expression
-		expression._parent = self
+		expression.Parent = self
 
 	@property
 	def Expression(self) -> ExpressionUnion:

{pyvhdlmodel-0.36.0 → pyvhdlmodel-0.37.0}/pyVHDLModel/Concurrent.py

@@ -95,7 +95,7 @@ class ConcurrentStatementsMixin(metaclass=ExtendedType, mixin=True):
 		if statements is not None:
 			for statement in statements:
 				self._statements.append(statement)
-				statement._parent = self
+				statement.Parent = self
 
 	@readonly
 	def Statements(self) -> List[ConcurrentStatement]:
@@ -147,14 +147,14 @@ class Instantiation(ConcurrentStatement):
 		if genericAssociations is not None:
 			for association in genericAssociations:
 				self._genericAssociations.append(association)
-				association._parent = self
+				association.Parent = self
 
 		# TODO: extract to mixin
 		self._portAssociations = []
 		if portAssociations is not None:
 			for association in portAssociations:
 				self._portAssociations.append(association)
-				association._parent = self
+				association.Parent = self
 
 	@readonly
 	def GenericAssociations(self) -> List[AssociationItem]:
@@ -190,7 +190,7 @@ class ComponentInstantiation(Instantiation):
 		super().__init__(label, genericAssociations, portAssociations, parent)
 
 		self._component = componentSymbol
-		componentSymbol._parent = self
+		componentSymbol.Parent = self
 
 	@property
 	def Component(self) -> ComponentInstantiationSymbol:
@@ -224,11 +224,11 @@ class EntityInstantiation(Instantiation):
 		super().__init__(label, genericAssociations, portAssociations, parent)
 
 		self._entity = entitySymbol
-		entitySymbol._parent = self
+		entitySymbol.Parent = self
 
 		self._architecture = architectureSymbol
 		if architectureSymbol is not None:
-			architectureSymbol._parent = self
+			architectureSymbol.Parent = self
 
 	@property
 	def Entity(self) -> EntityInstantiationSymbol:
@@ -264,7 +264,7 @@ class ConfigurationInstantiation(Instantiation):
 		super().__init__(label, genericAssociations, portAssociations, parent)
 
 		self._configuration = configurationSymbol
-		configurationSymbol._parent = self
+		configurationSymbol.Parent = self
 
 	@property
 	def Configuration(self) -> ConfigurationInstantiationSymbol:
@@ -331,7 +331,9 @@ class ConcurrentProcedureCall(ConcurrentStatement, ProcedureCallMixin):
 
 @export
 class ConcurrentBlockStatement(ConcurrentStatement, BlockStatementMixin, LabeledEntityMixin, ConcurrentDeclarationRegionMixin, ConcurrentStatementsMixin, DocumentedEntityMixin, AllowBlackboxMixin):
-	_portItems:     List[PortInterfaceItemMixin]
+	_portItems: List[PortInterfaceItemMixin]
+
+	_namespace: Namespace
 
 	def __init__(
 		self,
@@ -344,6 +346,11 @@ class ConcurrentBlockStatement(ConcurrentStatement, BlockStatementMixin, Labeled
 		parent:        Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, parent)
+
+		self._namespace = Namespace(self._normalizedLabel)
+		if parent is not None:
+			self._namespace.ParentNamespace = parent._namespace
+
 		BlockStatementMixin.__init__(self)
 		LabeledEntityMixin.__init__(self, label)
 		ConcurrentDeclarationRegionMixin.__init__(self, declaredItems)
@@ -356,7 +363,13 @@ class ConcurrentBlockStatement(ConcurrentStatement, BlockStatementMixin, Labeled
 		if portItems is not None:
 			for item in portItems:
 				self._portItems.append(item)
-				item._parent = self
+				item.Parent = self
+
+	@ConcurrentStatement.Parent.setter
+	def Parent(self, parent: ModelEntity) -> None:
+		ConcurrentStatement.Parent.fset(self, parent)
+
+		self._namespace.ParentNamespace = parent._namespace
 
 	@property
 	def PortItems(self) -> List[PortInterfaceItemMixin]:
@@ -389,14 +402,17 @@ class GenerateBranch(ModelEntity, ConcurrentDeclarationRegionMixin, ConcurrentSt
 		parent:           Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(parent)
-		ConcurrentDeclarationRegionMixin.__init__(self, declaredItems)
-		ConcurrentStatementsMixin.__init__(self, statements)
-		AllowBlackboxMixin.__init__(self, allowBlackbox)
 
 		self._alternativeLabel = alternativeLabel
 		self._normalizedAlternativeLabel = alternativeLabel.lower() if alternativeLabel is not None else None
 
 		self._namespace = Namespace(self._normalizedAlternativeLabel)
+		if parent is not None:
+			self._namespace.ParentNamespace = parent._namespace
+
+		ConcurrentDeclarationRegionMixin.__init__(self, declaredItems)
+		ConcurrentStatementsMixin.__init__(self, statements)
+		AllowBlackboxMixin.__init__(self, allowBlackbox)
 
 	@property
 	def AlternativeLabel(self) -> Nullable[str]:
@@ -517,8 +533,6 @@ class GenerateStatement(ConcurrentStatement, AllowBlackboxMixin):
 	   * :class:`For...generate statement <pyVHDLModel.Concurrent.ForGenerateStatement>`
 	"""
 
-	_namespace: Namespace
-
 	def __init__(
 		self,
 		label:         Nullable[str] = None,
@@ -528,8 +542,6 @@ class GenerateStatement(ConcurrentStatement, AllowBlackboxMixin):
 		super().__init__(label, parent)
 		AllowBlackboxMixin.__init__(self, allowBlackbox)
 
-		self._namespace = Namespace(self._normalizedLabel)
-
 	# @mustoverride
 	def IterateInstantiations(self) -> Generator[Instantiation, None, None]:
 		raise NotImplementedError()
@@ -580,20 +592,38 @@ class IfGenerateStatement(GenerateStatement):
 		super().__init__(label, allowBlackbox, parent)
 
 		self._ifBranch = ifBranch
-		ifBranch._parent = self
+		ifBranch.Parent = self
 
 		self._elsifBranches = []
 		if elsifBranches is not None:
 			for branch in elsifBranches:
 				self._elsifBranches.append(branch)
-				branch._parent = self
+				branch.Parent = self
 
 		if elseBranch is not None:
 			self._elseBranch = elseBranch
-			elseBranch._parent = self
+			elseBranch.Parent = self
 		else:
 			self._elseBranch = None
 
+	@GenerateStatement.Parent.setter
+	def Parent(self, parent: ModelEntity) -> None:
+		from pyVHDLModel.DesignUnit import Architecture
+
+		GenerateStatement.Parent.fset(self, parent)
+
+		# Connect namespaces
+		namespace = self._ifBranch._namespace
+		namespace.ParentNamespace = parent._namespace
+		if namespace._name == "":
+			namespace._name = self._normalizedLabel
+
+		for elseBranch in self._elsifBranches:
+			elseBranch._namespace.ParentNamespace = parent._namespace
+
+		if self._elseBranch is not None:
+			self._elseBranch._namespace.ParentNamespace = parent._namespace
+
 	@property
 	def IfBranch(self) -> IfGenerateBranch:
 		return self._ifBranch
@@ -634,7 +664,7 @@ class IndexedGenerateChoice(ConcurrentChoice):
 		super().__init__(parent)
 
 		self._expression = expression
-		expression._parent = self
+		expression.Parent = self
 
 	@property
 	def Expression(self) -> ExpressionUnion:
@@ -652,7 +682,7 @@ class RangedGenerateChoice(ConcurrentChoice):
 		super().__init__(parent)
 
 		self._range = rng
-		rng._parent = self
+		rng.Parent = self
 
 	@property
 	def Range(self) -> 'Range':
@@ -664,6 +694,8 @@ class RangedGenerateChoice(ConcurrentChoice):
 
 @export
 class ConcurrentCase(BaseCase, LabeledEntityMixin, ConcurrentDeclarationRegionMixin, ConcurrentStatementsMixin, AllowBlackboxMixin):
+	_namespace: Namespace
+
 	def __init__(
 		self,
 		declaredItems:    Nullable[Iterable] = None,
@@ -674,6 +706,14 @@ class ConcurrentCase(BaseCase, LabeledEntityMixin, ConcurrentDeclarationRegionMi
 	) -> None:
 		super().__init__(parent)
 		LabeledEntityMixin.__init__(self, alternativeLabel)
+
+		# TODO: Why not handover self?
+		#       This allows access to Label and NormalizedLabel, also to create a full instance path in case a lookup goes wrong.
+		# TODO: How about a WithNamespaceMixin class?
+		self._namespace = Namespace(self._normalizedLabel)
+		if parent is not None:
+			self._namespace.ParentNamespace = parent._namespace
+
 		ConcurrentDeclarationRegionMixin.__init__(self, declaredItems)
 		ConcurrentStatementsMixin.__init__(self, statements)
 		AllowBlackboxMixin.__init__(self, allowBlackbox)
@@ -699,7 +739,7 @@ class GenerateCase(ConcurrentCase):
 		if choices is not None:
 			for choice in choices:
 				self._choices.append(choice)
-				choice._parent = self
+				choice.Parent = self
 
 	# TODO: move to parent or grandparent
 	@property
@@ -749,14 +789,22 @@ class CaseGenerateStatement(GenerateStatement):
 		super().__init__(label, allowBlackbox, parent)
 
 		self._expression = expression
-		expression._parent = self
+		expression.Parent = self
 
 		# TODO: create a mixin for things with cases
 		self._cases = []
 		if cases is not None:
 			for case in cases:
 				self._cases.append(case)
-				case._parent = self
+				case.Parent = self
+
+	@GenerateStatement.Parent.setter
+	def Parent(self, parent: ModelEntity) -> None:
+		GenerateStatement.Parent.fset(self, parent)
+
+		# Connect namespaces
+		for case in self._cases:
+			case._namespace.ParentNamespace = parent._namespace
 
 	@property
 	def SelectExpression(self) -> ExpressionUnion:
@@ -792,6 +840,8 @@ class ForGenerateStatement(GenerateStatement, ConcurrentDeclarationRegionMixin,
 	_loopIndex: str
 	_range:     Range
 
+	_namespace: Namespace
+
 	def __init__(
 		self,
 		label:         str,
@@ -803,13 +853,24 @@ class ForGenerateStatement(GenerateStatement, ConcurrentDeclarationRegionMixin,
 		parent:        Nullable[ModelEntity] = None
 	) -> None:
 		super().__init__(label, allowBlackbox, parent)
+
+		self._namespace = Namespace(self._normalizedLabel)
+		if parent is not None:
+			self._namespace.ParentNamespace = parent._namespace
+
 		ConcurrentDeclarationRegionMixin.__init__(self, declaredItems)
 		ConcurrentStatementsMixin.__init__(self, statements)
 
 		self._loopIndex = loopIndex
 
 		self._range = rng
-		rng._parent = self
+		rng.Parent = self
+
+	@GenerateStatement.Parent.setter
+	def Parent(self, parent: ModelEntity) -> None:
+		GenerateStatement.Parent.fset(self, parent)
+
+		self._namespace.ParentNamespace = parent._namespace
 
 	@property
 	def LoopIndex(self) -> str:
@@ -859,7 +920,7 @@ class ConcurrentSimpleSignalAssignment(ConcurrentSignalAssignment):
 		if waveform is not None:
 			for waveformElement in waveform:
 				self._waveform.append(waveformElement)
-				waveformElement._parent = self
+				waveformElement.Parent = self
 
 	@property
 	def Waveform(self) -> List[WaveformElement]:

{pyvhdlmodel-0.36.0 → pyvhdlmodel-0.37.0}/pyVHDLModel/Declaration.py

@@ -110,7 +110,7 @@ class Attribute(ModelEntity, NamedEntityMixin, DocumentedEntityMixin):
 		DocumentedEntityMixin.__init__(self, documentation)
 
 		self._subtype = subtype
-		subtype._parent = self
+		subtype.Parent = self
 
 	@readonly
 	def Subtype(self) -> None:
@@ -149,15 +149,15 @@ class AttributeSpecification(ModelEntity, DocumentedEntityMixin):
 		self._identifiers = []  # TODO: convert to dict
 		for identifier in identifiers:
 			self._identifiers.append(identifier)
-			identifier._parent = self
+			identifier.Parent = self
 
 		self._attribute = attribute
-		attribute._parent = self
+		attribute.Parent = self
 
 		self._entityClass = entityClass
 
 		self._expression = expression
-		expression._parent = self
+		expression.Parent = self
 
 	@readonly
 	def Identifiers(self) -> List[Name]:

{pyvhdlmodel-0.36.0 → pyvhdlmodel-0.37.0}/pyVHDLModel/DesignUnit.py

@@ -384,7 +384,7 @@ class Context(PrimaryUnit):
 		if references is not None:
 			for reference in references:
 				self._references.append(reference)
-				reference._parent = self
+				reference.Parent = self
 
 				if isinstance(reference, LibraryClause):
 					self._libraryReferences.append(reference)
@@ -485,7 +485,7 @@ class Package(PrimaryUnit, DesignUnitWithContextMixin, WithGenericsMixin, Concur
 			for normalizedIdentifier in item.NormalizedIdentifiers:
 				self._deferredConstants[normalizedIdentifier] = item
 		elif isinstance(item, Component):
-			self._components[item.NormalizedIdentifier] = item
+			self._components[item._normalizedIdentifier] = item
 		else:
 			super()._IndexOtherDeclaredItem(item)
 
@@ -529,7 +529,7 @@ class PackageBody(SecondaryUnit, DesignUnitWithContextMixin, ConcurrentDeclarati
 		ConcurrentDeclarationRegionMixin.__init__(self, declaredItems)
 
 		self._package = packageSymbol
-		packageSymbol._parent = self
+		packageSymbol.Parent = self
 
 	@property
 	def Package(self) -> PackageSymbol:
@@ -644,10 +644,10 @@ class Architecture(SecondaryUnit, DesignUnitWithContextMixin, ConcurrentDeclarat
 		AllowBlackboxMixin.__init__(self, allowBlackbox)
 
 		self._entity = entity
-		entity._parent = self
+		entity.Parent = self
 
 	@property
-	def Entity(self) -> EntitySymbol:
+	def Entity(self) -> EntitySymbol:  # FIXME: change to entitySymbol, offer entity directly, but raise exception if not resolved.
 		return self._entity
 
 	def __str__(self) -> str:
@@ -706,14 +706,14 @@ class Component(ModelEntity, NamedEntityMixin, DocumentedEntityMixin, AllowBlack
 		if genericItems is not None:
 			for item in genericItems:
 				self._genericItems.append(item)
-				item._parent = self
+				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
+				item.Parent = self
 
 	@property
 	def IsBlackbox(self) -> Nullable[bool]:

{pyvhdlmodel-0.36.0 → pyvhdlmodel-0.37.0}/pyVHDLModel/Expression.py

@@ -302,7 +302,7 @@ class UnaryExpression(BaseExpression):
 		super().__init__(parent)
 
 		self._operand = operand
-		# operand._parent = self  # FIXME: operand is provided as None
+		# operand.Parent = self  # FIXME: operand is provided as None
 
 	@readonly
 	def Operand(self):
@@ -384,10 +384,10 @@ class BinaryExpression(BaseExpression):
 		super().__init__(parent)
 
 		self._leftOperand = leftOperand
-		leftOperand._parent = self
+		leftOperand.Parent = self
 
 		self._rightOperand = rightOperand
-		rightOperand._parent = self
+		rightOperand.Parent = self
 
 	@property
 	def LeftOperand(self):
@@ -642,10 +642,10 @@ class QualifiedExpression(BaseExpression, ParenthesisExpression):
 		super().__init__(parent)
 
 		self._operand = operand
-		operand._parent = self
+		operand.Parent = self
 
 		self._subtype = subtype
-		subtype._parent = self
+		subtype.Parent = self
 
 	@property
 	def Operand(self):
@@ -720,7 +720,7 @@ class SubtypeAllocation(Allocation):
 		super().__init__(parent)
 
 		self._subtype = subtype
-		subtype._parent = self
+		subtype.Parent = self
 
 	@property
 	def Subtype(self) -> Symbol:
@@ -738,7 +738,7 @@ class QualifiedExpressionAllocation(Allocation):
 		super().__init__(parent)
 
 		self._qualifiedExpression = qualifiedExpression
-		qualifiedExpression._parent = self
+		qualifiedExpression.Parent = self
 
 	@property
 	def QualifiedExpression(self) -> QualifiedExpression:
@@ -758,7 +758,7 @@ class AggregateElement(ModelEntity):
 		super().__init__(parent)
 
 		self._expression = expression
-		expression._parent = self
+		expression.Parent = self
 
 	@property
 	def Expression(self):
@@ -796,7 +796,7 @@ class RangedAggregateElement(AggregateElement):
 		super().__init__(expression, parent)
 
 		self._range = rng
-		rng._parent = self
+		rng.Parent = self
 
 	@property
 	def Range(self) -> Range:
@@ -814,7 +814,7 @@ class NamedAggregateElement(AggregateElement):
 		super().__init__(expression, parent)
 
 		self._name = name
-		name._parent = self
+		name.Parent = self
 
 	@property
 	def Name(self) -> Symbol:
@@ -845,7 +845,7 @@ class Aggregate(BaseExpression):
 		self._elements = []
 		for element in elements:
 			self._elements.append(element)
-			element._parent = self
+			element.Parent = self
 
 	@property
 	def Elements(self) -> List[AggregateElement]:

{pyvhdlmodel-0.36.0 → pyvhdlmodel-0.37.0}/pyVHDLModel/Instantiation.py

@@ -83,12 +83,12 @@ class PackageInstantiation(Package, GenericInstantiationMixin):  # TODO: maybe a
 	_packageReference: PackageReferenceSymbol
 	_genericAssociations: List[GenericAssociationItem]
 
-	def __init__(self, identifier: str, uninstantiatedPackage: PackageReferenceSymbol, documentation: Nullable[str] = None, parent: Nullable[ModelEntity] = None) -> None:
+	def __init__(self, identifier: str, genericPackage: PackageReferenceSymbol, documentation: Nullable[str] = None, parent: Nullable[ModelEntity] = None) -> None:
 		super().__init__(identifier, documentation=documentation, parent=parent)
 		GenericEntityInstantiationMixin.__init__(self)
 
-		self._packageReference = uninstantiatedPackage
-		# uninstantiatedPackage._parent = self    # FIXME: uninstantiatedPackage is provided as int
+		self._packageReference = genericPackage
+		self._packageReference.Parent = self
 
 		# TODO: extract to mixin
 		self._genericAssociations = []