v0.15.0

Author: Paebbels

.github/workflows/Pipeline.yml

@@ -87,13 +87,13 @@ jobs:
 
     steps:
       - name: ⏬ Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: ⚙ Setup GHDL
         uses: ghdl/setup-ghdl-ci@master
 
       - name: 🐍 Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ fromJson(needs.Params.outputs.params).python_version }}
 

pyVHDLModel/SyntaxModel.py

@@ -194,6 +194,7 @@ def __init__(self, symbolName: Name):
 	@property
 	def Library(self) -> 'Library':
 		return self._library
+
 	@Library.setter
 	def Library(self, value: 'Library') -> None:
 		self._reference = value
@@ -207,6 +208,7 @@ def __init__(self, entityName: Name):
 	@property
 	def Entity(self) -> 'Entity':
 		return self._reference
+
 	@Entity.setter
 	def Entity(self, value: 'Entity') -> None:
 		self._reference = value
@@ -220,6 +222,7 @@ def __init__(self, symbolName: Name):
 	@property
 	def Architecture(self) -> 'Architecture':
 		return self._reference
+
 	@Architecture.setter
 	def Architecture(self, value: 'Architecture') -> None:
 		self._reference = value
@@ -233,6 +236,7 @@ def __init__(self, symbolName: Name):
 	@property
 	def Component(self) -> 'Component':
 		return self._reference
+
 	@Component.setter
 	def Component(self, value: 'Component') -> None:
 		self._reference = value
@@ -246,6 +250,7 @@ def __init__(self, symbolName: Name):
 	@property
 	def Configuration(self) -> 'Configuration':
 		return self._reference
+
 	@Configuration.setter
 	def Configuration(self, value: 'Configuration') -> None:
 		self._reference = value
@@ -259,6 +264,7 @@ def __init__(self, symbolName: Name):
 	@property
 	def Context(self) -> 'Context':
 		return self._reference
+
 	@Context.setter
 	def Context(self, value: 'Context') -> None:
 		self._reference = value
@@ -272,6 +278,7 @@ def __init__(self, symbolName: Name, possibleReferences: PossibleReference):
 	@property
 	def Subtype(self) -> 'Subtype':
 		return self._reference
+
 	@Subtype.setter
 	def Subtype(self, value: 'Subtype') -> None:
 		self._reference = value
@@ -323,6 +330,7 @@ def __init__(self, objectName: Name):
 	@property
 	def ObjectOrFunction(self) -> Union['Constant', 'Signal', 'Variable', 'Function', 'EnumerationLiteral']:
 		return self._reference
+
 	@ObjectOrFunction.setter
 	def ObjectOrFunction(self, value: Union['Constant', 'Signal', 'Variable', 'Function', 'EnumerationLiteral']):
 		self._reference = value
@@ -336,6 +344,7 @@ def __init__(self, objectName: Name):
 	@property
 	def ObjectOrFunction(self) -> Union['Constant', 'Signal', 'Variable', 'Function']:
 		return self._reference
+
 	@ObjectOrFunction.setter
 	def ObjectOrFunction(self, value: Union['Constant', 'Signal', 'Variable', 'Function']):
 		self._reference = value
@@ -349,11 +358,26 @@ def __init__(self, symbolName: Name):
 	@property
 	def Constant(self) -> 'Constant':
 		return self._reference
+
 	@Constant.setter
 	def Constant(self, value: 'Constant') -> None:
 		self._reference = value
 
 
+@export
+class VariableSymbol(ObjectSymbol):
+	def __init__(self, symbolName: Name):
+		super().__init__(symbolName, PossibleReference.Constant)
+
+	@property
+	def Variable(self) -> 'Variable':
+		return self._reference
+
+	@Variable.setter
+	def Variable(self, value: 'Variable') -> None:
+		self._reference = value
+
+
 @export
 class SignalSymbol(ObjectSymbol):
 	def __init__(self, symbolName: Name):
@@ -362,6 +386,7 @@ def __init__(self, symbolName: Name):
 	@property
 	def Signal(self) -> 'Signal':
 		return self._reference
+
 	@Signal.setter
 	def Signal(self, value: 'Signal') -> None:
 		self._reference = value

pyVHDLModel/__init__.py

@@ -39,7 +39,7 @@
 __email__ =     "[email protected]"
 __copyright__ = "2016-2022, Patrick Lehmann"
 __license__ =   "Apache License, Version 2.0"
-__version__ =   "0.14.4"
+__version__ =   "0.15.0"
 
 
 from enum     import IntEnum, unique, Enum
@@ -81,8 +81,8 @@
 ]
 
 ContextUnion = Union[
-	'LibraryClause'
-	'UseClause'
+	'LibraryClause',
+	'UseClause',
 	'ContextReference'
 ]
 
@@ -91,7 +91,7 @@
 @unique
 class VHDLVersion(Enum):
 	"""
-	An enumeration for all possible version numbers for VHDL.
+	An enumeration for all possible version numbers for VHDL and VHDL-AMS.
 
 	A version can be given as integer or string and is represented as a unified
 	enumeration value.
@@ -102,31 +102,42 @@ class VHDLVersion(Enum):
 	Any =                -1
 	VHDL87 =             87
 	VHDL93 =             93
+#	AMS93 =              93
+	AMS99 =              99
 	VHDL2002 =         2002
 	VHDL2008 =         2008
+	AMS2017 =          2017
 	VHDL2019 =         2019
 
 	__VERSION_MAPPINGS__: Dict[Union[int, str], Enum] = {
 		87:     VHDL87,
 		93:     VHDL93,
+		99:     AMS99,
 		2:      VHDL2002,
 		8:      VHDL2008,
+		17:     AMS2017,
 		19:     VHDL2019,
 		1987:   VHDL87,
 		1993:   VHDL93,
+		1999:   AMS99,
 		2002:   VHDL2002,
 		2008:   VHDL2008,
+		2017:   AMS2017,
 		2019:   VHDL2019,
 		"Any":  Any,
 		"87":   VHDL87,
 		"93":   VHDL93,
+		"99":   AMS99,
 		"02":   VHDL2002,
 		"08":   VHDL2008,
+		"17":   AMS2017,
 		"19":   VHDL2019,
 		"1987": VHDL87,
 		"1993": VHDL93,
+		"1999": AMS99,
 		"2002": VHDL2002,
 		"2008": VHDL2008,
+		"2017": AMS2017,
 		"2019": VHDL2019
 	}
 
@@ -182,6 +193,12 @@ def __eq__(self, other: Any) -> bool:
 		else:
 			raise TypeError("Second operand is not of type 'VHDLVersion'.")
 
+	def IsVHDL(self) -> bool:
+		return self in (self.VHDL87, self.VHDL93, self.VHDL2002, self.VHDL2008, self.VHDL2019)
+
+	def IsAMS(self) -> bool:
+		return self in (self.AMS99, self.AMS2017)
+
 	def __str__(self) -> str:
 		return "VHDL'" + str(self.value)[-2:]
 
@@ -396,22 +413,23 @@ def Label(self) -> str:
 		"""Returns a model entity's label."""
 		return self._label
 
+
 @export
 class MixinDesignUnitWithContext:
-	_contextItems:      Nullable[List['ContextUnion']]
-	_libraryReferences: Nullable[List['LibraryClause']]
-	_packageReferences: Nullable[List['UseClause']]
-	_contextReferences: Nullable[List['ContextReference']]
+	_contextItems:      List['ContextUnion']
+	_libraryReferences: List['LibraryClause']
+	_packageReferences: List['UseClause']
+	_contextReferences: List['ContextReference']
 
 	def __init__(self, contextItems: Iterable['ContextUnion'] = None):
 		from pyVHDLModel.SyntaxModel import LibraryClause, UseClause, ContextReference
 
-		if contextItems is not None:
-			self._contextItems = []
-			self._libraryReferences = []
-			self._packageReferences = []
-			self._contextReferences = []
+		self._contextItems = []
+		self._libraryReferences = []
+		self._packageReferences = []
+		self._contextReferences = []
 
+		if contextItems is not None:
 			for item in contextItems:
 				self._contextItems.append(item)
 				if isinstance(item, UseClause):
@@ -458,6 +476,7 @@ class PrimaryUnit(DesignUnit):
 	@property
 	def Library(self) -> 'Library':
 		return self._parent
+
 	@Library.setter
 	def Library(self, library: 'Library') -> None:
 		self._parent = library