v0.24.1

VHDL · Apr 2, 2023 · 7590a6c · 7590a6c
2 parents c897177 + 93d3b59
commit 7590a6c
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 7 deletions.
diff --git a/doc/Dependency.rst b/doc/Dependency.rst
@@ -23,7 +23,7 @@ pyVHDLModel Package
 +--------------------------------------------------------+-------------+------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------+
 | **Package**                                            | **Version** | **License**                                                                              | **Dependencies**                                                                                                                |
 +========================================================+=============+==========================================================================================+=================================================================================================================================+
-| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥4.0.0      | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/master/LICENSE.txt>`__ | *None*                                                                                                                          |
+| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__ | ≥4.0.1      | `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>`__                     | ≥4.0.0       | `Apache License, 2.0 <https://GitHub.com/pyTooling/pyTooling/blob/main/LICENSE.md>`__                    | *None*                                                                                                                                               |
+| `pyTooling <https://GitHub.com/pyTooling/pyTooling>`__                     | ≥4.0.1       | `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.*                                                                                                                                 |
 +----------------------------------------------------------------------------+--------------+----------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------+

diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -1,6 +1,6 @@
 -r ../requirements.txt
 
-pyTooling>=4.0.0, <5.0
+pyTooling>=4.0.1, <5.0
 
 # Enforce latest version on ReadTheDocs
 sphinx>=5.3.0, <6.0

diff --git a/pyVHDLModel/IEEE.py b/pyVHDLModel/IEEE.py
@@ -40,6 +40,10 @@ class Ieee(PredefinedLibrary):
 	def __init__(self):
 		super().__init__(PACKAGES)
 
+	def LoadSynopsysPackages(self):
+		self.AddPackages(PACKAGES_SYNOPSYS)
+
+
 
 @export
 class Math_Real(PredefinedPackage):
@@ -84,6 +88,18 @@ def __init__(self):
 		self._AddPackageClause(("IEEE.std_logic_1164.all", ))
 
 
+class Std_logic_misc(PredefinedPackage):
+	def __init__(self):
+		super().__init__()
+
+		self._AddLibraryClause(("IEEE", ))
+		self._AddPackageClause(("IEEE.std_logic_1164.all", ))
+
+
+class Std_logic_misc_Body(PredefinedPackageBody):
+	pass
+
+
 class Numeric_Bit(PredefinedPackage):
 	def __init__(self):
 		super().__init__()
@@ -119,7 +135,6 @@ def __init__(self):
 class Numeric_Std_Body(PredefinedPackageBody):
 	pass
 
-
 class Numeric_Std_Unsigned(PredefinedPackage):
 	def __init__(self):
 		super().__init__()
@@ -203,3 +218,7 @@ def __init__(self):
 	(Float_Generic_Pkg, Float_Generic_Pkg_Body),
 	(Float_Pkg, None),
 )
+
+PACKAGES_SYNOPSYS = (
+	(Std_logic_misc, Std_logic_misc_Body),
+)
diff --git a/pyVHDLModel/STD.py b/pyVHDLModel/STD.py
@@ -44,6 +44,9 @@ class PredefinedLibrary(Library):
 	def __init__(self, packages):
 		super().__init__(self.__class__.__name__)
 
+		self.AddPackages(packages)
+
+	def AddPackages(self, packages):
 		for packageType, packageBodyType in packages:
 			package: Package = packageType()
 			package.Library = self

diff --git a/pyVHDLModel/__init__.py b/pyVHDLModel/__init__.py
@@ -48,7 +48,7 @@
 __email__ =     "Paebbels@gmail.com"
 __copyright__ = "2016-2023, Patrick Lehmann"
 __license__ =   "Apache License, Version 2.0"
-__version__ =   "0.24.0"
+__version__ =   "0.24.1"
 
 
 from enum                      import unique, Enum, Flag, auto

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [build-system]
 requires = [
-    "pyTooling >= 4.0.0",
+    "pyTooling >= 4.0.1",
     "setuptools >= 62.3.3",
     "wheel >= 0.38.1"
 ]

diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-pyTooling>=4.0.0, <5.0
+pyTooling>=4.0.1, <5.0
diff --git a/tests/unit/Instantiate.py b/tests/unit/Instantiate.py
@@ -432,3 +432,15 @@ def test_IeeeLibrary(self):
 		self.assertEqual(9, len(ieeeLibrary.PackageBodies))
 
 		self.assertSetEqual(set(design.IterateDesignUnits()), set(ieeeLibrary.IterateDesignUnits()))
+
+	def test_IeeeSynopsysLibrary(self):
+		design = Design()
+		ieeeLibrary = design.LoadIEEELibrary()
+		ieeeLibrary.LoadSynopsysPackages()
+
+		self.assertEqual(1, len(design.Libraries))
+		self.assertEqual("ieee", ieeeLibrary.NormalizedIdentifier)
+		self.assertEqual(14, len(ieeeLibrary.Packages))
+		self.assertEqual(10, len(ieeeLibrary.PackageBodies))
+
+		self.assertSetEqual(set(design.IterateDesignUnits()), set(ieeeLibrary.IterateDesignUnits()))