General updates and fixes.

doc/Dependency.rst

@@ -23,7 +23,7 @@ pyVHDLModel Package
 +--------------------------------------------------------+-------------+------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
 | **Package**                                            | **Version** | **License**                                                                              | **Dependencies**                                                                                                                |
 +========================================================+=============+==========================================================================================+=================================================================================================================================+
-| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥2.13.0     | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/master/LICENSE.txt>`__ | *None*                                                                                                                          |
+| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥4.0.0      | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/master/LICENSE.txt>`__ | *None*                                                                                                                          |
 +--------------------------------------------------------+-------------+------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
 
 
@@ -125,7 +125,7 @@ install the mandatory dependencies too.
 +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
 | **Package**                                                                | **Version**  | **License**                                                                                              | **Dependencies**                                                                                                                                     |
 +============================================================================+==============+==========================================================================================================+======================================================================================================================================================+
-| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__                     | ≥2.13.0      | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/main/LICENSE.md>`__                    | *None*                                                                                                                                               |
+| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__                     | ≥4.0.0       | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/main/LICENSE.md>`__                    | *None*                                                                                                                                               |
 +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+
 | `wheel <https://GitHub.com/pypa/wheel>`__                                  | ≥0.38.1      | `MIT <https://github.com/pypa/wheel/blob/main/LICENSE.txt>`__                                            | *Not yet evaluated.*                                                                                                                                 |
 +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+

doc/LanguageModel/InterfaceItems.rst

@@ -44,7 +44,7 @@ GenericConstantInterfaceItem
 
      # inherited from Object
      @property
-     def SubType(self) -> SubType:
+     def Subtype(self) -> Subtype:
 
      # inherited from WithDefaultExpressionMixin
      @property
@@ -156,7 +156,7 @@ PortSignalInterfaceItem
 
      # inherited from Object
      @property
-     def SubType(self) -> SubType:
+     def Subtype(self) -> Subtype:
 
      # inherited from WithDefaultExpressionMixin
      @property
@@ -198,7 +198,7 @@ ParameterConstantInterfaceItem
 
      # inherited from Object
      @property
-     def SubType(self) -> SubType:
+     def Subtype(self) -> Subtype:
 
      # inherited from WithDefaultExpressionMixin
      @property
@@ -235,7 +235,7 @@ ParameterVariableInterfaceItem
 
      # inherited from Object
      @property
-     def SubType(self) -> SubType:
+     def Subtype(self) -> Subtype:
 
      # inherited from WithDefaultExpressionMixin
      @property
@@ -272,7 +272,7 @@ ParameterSignalInterfaceItem
 
      # inherited from Object
      @property
-     def SubType(self) -> SubType:
+     def Subtype(self) -> Subtype:
 
      # inherited from WithDefaultExpressionMixin
      @property

doc/LanguageModel/ObjectDeclarations.rst

@@ -53,7 +53,7 @@ a deferred constant. See :ref:`vhdlmodel-deferredconstant` in next section.
 
      # inherited from Object
      @property
-     def SubType(self) -> SubType:
+     def Subtype(self) -> Subtype:
 
      @property
      def DefaultExpression(self) -> BaseExpression:
@@ -84,7 +84,7 @@ a deferred constant has a reference to the *regular* constant of the same name.
 
      # inherited from Object
      @property
-     def SubType(self) -> SubType:
+     def Subtype(self) -> Subtype:
 
      # inherited from WithDefaultExpressionMixin
      @property
@@ -149,7 +149,7 @@ expression.
 
      # inherited from Object
      @property
-     def SubType(self) -> SubType:
+     def Subtype(self) -> Subtype:
 
      # inherited from WithDefaultExpressionMixin
      @property
@@ -211,7 +211,7 @@ assigned via a default expression.
 
      # inherited from Object
      @property
-     def SubType(self) -> SubType:
+     def Subtype(self) -> Subtype:
 
      # inherited from WithDefaultExpressionMixin
      @property

doc/LanguageModel/SubprogramDefinitions.rst

@@ -170,7 +170,7 @@ Function
 
      # from Function
      @property
-     def ReturnType(self) -> SubType:
+     def ReturnType(self) -> Subtype:
 
 
 
@@ -222,7 +222,7 @@ Function as Method
 
      # inherited from Function
      @property
-     def ReturnType(self) -> SubType:
+     def ReturnType(self) -> Subtype:
 
      # inherited from Method
      @property

doc/LanguageModel/TypeDefinitions.rst

@@ -184,7 +184,7 @@ Array
      def Dimensions(self) -> List[Range]:
 
      @property
-     def ElementType(self) -> SubType:
+     def ElementType(self) -> Subtype:
 
 
 

doc/requirements.txt

@@ -1,6 +1,6 @@
 -r ../requirements.txt
 
-pyTooling>=2.13.0, <3.0
+pyTooling>=4.0.0, <5.0
 
 # Enforce latest version on ReadTheDocs
 sphinx>=5.3.0, <6.0

pyVHDLModel/DesignUnit.py

@@ -108,8 +108,8 @@ class DesignUnit(ModelEntity, NamedEntityMixin, DocumentedEntityMixin):
 	_referencedPackages:  Dict[str, Dict[str, 'Package']]  #: Referenced packages based on explicit use clauses or implicit inheritance
 	_referencedContexts:  Dict[str, 'Context']             #: Referenced contexts based on explicit context references or implicit inheritance
 
-	_dependencyVertex:    Vertex[None, None, str, 'DesignUnit', None, None, None, None, None, None, None, None]  #: The vertex in the dependency graph
-	_hierarchyVertex:     Vertex[None, None, str, 'DesignUnit', None, None, None, None, None, None, None, None]  #: The vertex in the hierarchy graph
+	_dependencyVertex:    Vertex[None, None, str, 'DesignUnit', None, None, None, None, None, None, None, None, None, None, None, None, None]  #: The vertex in the dependency graph
+	_hierarchyVertex:     Vertex[None, None, str, 'DesignUnit', None, None, None, None, None, None, None, None, None, None, None, None, None]  #: The vertex in the hierarchy graph
 
 	_namespace:           'Namespace'
 

pyVHDLModel/Subprogram.py

@@ -44,7 +44,7 @@
 
 
 @export
-class SubProgramm(ModelEntity, NamedEntityMixin, DocumentedEntityMixin):
+class Subprogram(ModelEntity, NamedEntityMixin, DocumentedEntityMixin):
 	_genericItems:   List['GenericInterfaceItem']
 	_parameterItems: List['ParameterInterfaceItem']
 	_declaredItems:  List
@@ -83,12 +83,14 @@ def IsPure(self) -> bool:
 
 
 @export
-class Procedure(SubProgramm):
-	_isPure: bool = False
+class Procedure(Subprogram):
+	def __init__(self, identifier: str, documentation: str = None):
+		super().__init__(identifier, documentation)
+		self._isPure = False
 
 
 @export
-class Function(SubProgramm):
+class Function(Subprogram):
 	_returnType: Subtype
 
 	def __init__(self, identifier: str, isPure: bool = True, documentation: str = None):

pyVHDLModel/__init__.py

@@ -374,9 +374,9 @@ class Design(ModelEntity):
 	name:               Nullable[str]         #: Name of the design
 	_libraries:         Dict[str, 'Library']  #: List of all libraries defined for a design.
 	_documents:         List['Document']      #: List of all documents loaded for a design.
-	_dependencyGraph:   Graph[None, None, None, None, None, None, None, None, str, DesignUnit, None, None, None, None, None, None, None, None]   #: The graph of all dependencies in the designs.
-	_compileOrderGraph: Graph[None, None, None, None, None, None, None, None, None, 'Document', None, None, None, None, None, None, None, None]  #: A graph derived from dependency graph containing the order of documents for compilation.
-	_hierarchyGraph:    Graph[None, None, None, None, None, None, None, None, str, DesignUnit, None, None, None, None, None, None, None, None]   #: A graph derived from dependency graph containing the design hierarchy.
+	_dependencyGraph:   Graph[None, None, None, None, None, None, None, None, str, DesignUnit, None, None, None, None, None, None, None, None, None, None, None, None, None]   #: The graph of all dependencies in the designs.
+	_compileOrderGraph: Graph[None, None, None, None, None, None, None, None, None, 'Document', None, None, None, None, None, None, None, None, None, None, None, None, None]  #: A graph derived from dependency graph containing the order of documents for compilation.
+	_hierarchyGraph:    Graph[None, None, None, None, None, None, None, None, str, DesignUnit, None, None, None, None, None, None, None, None, None, None, None, None, None]   #: A graph derived from dependency graph containing the design hierarchy.
 	_toplevel:          Union[Entity, Configuration]  #: When computed, the toplevel design unit is cached in this field.
 
 	def __init__(self, name: str = None):
@@ -1053,7 +1053,7 @@ class Library(ModelEntity, NamedEntityMixin):
 	_packages:       Dict[str, Package]                  #: Dictionary of all packages defined in a library.
 	_packageBodies:  Dict[str, PackageBody]              #: Dictionary of all package bodies defined in a library.
 
-	_dependencyVertex: Vertex[None, None, str, Union['Library', DesignUnit], None, None, None, None, None, None, None, None]
+	_dependencyVertex: Vertex[None, None, str, Union['Library', DesignUnit], None, None, None, None, None, None, None, None, None, None, None, None, None]
 
 	def __init__(self, identifier: str):
 		super().__init__()
@@ -1200,8 +1200,8 @@ class Document(ModelEntity, DocumentedEntityMixin):
 	_verificationProperties: Dict[str, VerificationProperty]     #: Dictionary of all PSL verification properties defined in a document.
 	_verificationModes:      Dict[str, VerificationMode]         #: Dictionary of all PSL verification modes defined in a document.
 
-	_dependencyVertex:       Vertex[None, None, None, 'Document', None, None, None, None, None, None, None, None]
-	_compileOrderVertex:     Vertex[None, None, None, 'Document', None, None, None, None, None, None, None, None]
+	_dependencyVertex:       Vertex[None, None, None, 'Document', None, None, None, None, None, None, None, None, None, None, None, None, None]
+	_compileOrderVertex:     Vertex[None, None, None, 'Document', None, None, None, None, None, None, None, None, None, None, None, None, None]
 
 	def __init__(self, path: Path, documentation: str = None):
 		super().__init__()
@@ -1428,7 +1428,7 @@ def VerificationModes(self) -> Dict[str, VerificationMode]:
 		return self._verificationModes
 
 	@property
-	def CompileOrderVertex(self) -> Vertex[None, None, None, 'Document', None, None, None, None, None, None, None, None]:
+	def CompileOrderVertex(self) -> Vertex[None, None, None, 'Document', None, None, None, None, None, None, None, None, None, None, None, None, None]:
 		return self._compileOrderVertex
 
 	def IterateDesignUnits(self, filter: DesignUnitKind = DesignUnitKind.All) -> Generator[DesignUnit, None, None]:

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "pyTooling >= 2.13.0",
+    "pyTooling >= 4.0.0",
     "setuptools >= 62.3.3",
     "wheel >= 0.38.1"
 ]

requirements.txt

@@ -1 +1 @@
-pyTooling>=2.13.0, <3.0
+pyTooling>=4.0.0, <5.0