v0.2.0

Author: Paebbels

pySystemRDLModel/__init__.py

@@ -44,50 +44,53 @@
 __email__ =     "[email protected]"
 __copyright__ = "2023-2023, Patrick Lehmann"
 __license__ =   "Apache License, Version 2.0"
-__version__ =   "0.1.0"
+__version__ =   "0.2.0"
 
 
 @export
 @unique
 class SystemRDLVersion(Enum):
-	Any =                 -1
-	SystemVerilog2005 = 2005
-	SystemVerilog2009 = 2009
-	SystemVerilog2012 = 2012
-	SystemVerilog2017 = 2017
+	Any =             -1
+	SystemRDL2005 = 2005
+	SystemRDL2009 = 2009
+	SystemRDL2012 = 2012
+	SystemRDL2017 = 2017
 
 	__VERSION_MAPPINGS__: Dict[Union[int, str], Enum] = {
-		5:      SystemVerilog2005,
-		9:      SystemVerilog2009,
-		12:     SystemVerilog2012,
-		17:     SystemVerilog2017,
-		2005:   SystemVerilog2005,
-		2009:   SystemVerilog2009,
-		2012:   SystemVerilog2012,
-		2017:   SystemVerilog2017,
+		-1:     Any,
+		5:      SystemRDL2005,
+		9:      SystemRDL2009,
+		12:     SystemRDL2012,
+		17:     SystemRDL2017,
+		2005:   SystemRDL2005,
+		2009:   SystemRDL2009,
+		2012:   SystemRDL2012,
+		2017:   SystemRDL2017,
 		"Any":  Any,
-		"05":   SystemVerilog2005,
-		"09":   SystemVerilog2009,
-		"12":   SystemVerilog2012,
-		"17":   SystemVerilog2017,
-		"2005": SystemVerilog2005,
-		"2009": SystemVerilog2009,
-		"2012": SystemVerilog2012,
-		"2017": SystemVerilog2017,
+		"05":   SystemRDL2005,
+		"09":   SystemRDL2009,
+		"12":   SystemRDL2012,
+		"17":   SystemRDL2017,
+		"2005": SystemRDL2005,
+		"2009": SystemRDL2009,
+		"2012": SystemRDL2012,
+		"2017": SystemRDL2017,
 	}
 
 	def __init__(self, *_):
 		"""Patch the embedded MAP dictionary"""
-		for k, v in self.__class__.__VERSION_MAPPINGS__.items():
-			if (not isinstance(v, self.__class__)) and (v == self.value):
-				self.__class__.__VERSION_MAPPINGS__[k] = self
+		cls = self.__class__
+		for k, v in cls.__VERSION_MAPPINGS__.items():
+			if (not isinstance(v, cls)) and (v == self.value):
+				print(f"patching {k}:{v} with {self}")
+				cls.__VERSION_MAPPINGS__[k] = self
 
 	@classmethod
-	def Parse(cls, value):
+	def Parse(cls, value: Union[int, str]) -> "SystemRDLVersion":
 		try:
 			return cls.__VERSION_MAPPINGS__[value]
 		except KeyError:
-			ValueError(f"Value '{value!s}' cannot be parsed to member of {cls.__name__}.")
+			raise ValueError(f"Value '{value!s}' cannot be parsed to member of {cls.__name__}.")
 
 	def __lt__(self, other):
 		return self.value < other.value
@@ -110,8 +113,14 @@ def __eq__(self, other):
 		else:
 			return self.value == other.value
 
-	def __str__(self):
-		return "SV'" + str(self.value)[-2:]
+	def __str__(self) -> str:
+		if self.value == -1:
+			return "SystemRDL'Any"
+		else:
+			return f"SystemRDL'{str(self.value)[-2:]}"
 
-	def __repr__(self):
-		return str(self.value)
+	def __repr__(self) -> str:
+		if self.value == -1:
+			return "Any"
+		else:
+			return str(self.value)

tests/unit/Instantiate.py

@@ -40,8 +40,90 @@
 	exit(1)
 
 
-class Instantiate(TestCase):
-	def test_SystemRDLVersion(self):
-		version = SystemRDLVersion.Parse("2017")
+class SysRDLVersion(TestCase):
+	def test_Any(self):
+		versions = (
+			SystemRDLVersion.Parse(-1),
+			SystemRDLVersion.Parse("Any"),
+		)
 
-		self.assertIsNotNone(version)
+		for version in versions:
+			self.assertIs(SystemRDLVersion.Any, version)
+
+		print()
+		print(version)
+		print(version.value)
+
+	def test_2005(self):
+		versions = (
+			SystemRDLVersion.Parse(5),
+			SystemRDLVersion.Parse(2005),
+			SystemRDLVersion.Parse("05"),
+			SystemRDLVersion.Parse("2005"),
+		)
+
+		for version in versions:
+			self.assertIs(SystemRDLVersion.SystemRDL2005, version)
+
+		print()
+		print(version)
+		print(version.value)
+
+	def test_2009(self):
+		versions = (
+			SystemRDLVersion.Parse(9),
+			SystemRDLVersion.Parse(2009),
+			SystemRDLVersion.Parse("09"),
+			SystemRDLVersion.Parse("2009"),
+		)
+
+		for version in versions:
+			self.assertIs(SystemRDLVersion.SystemRDL2009, version)
+
+		print()
+		print(version)
+		print(version.value)
+
+	def test_2012(self):
+		versions = (
+			SystemRDLVersion.Parse(12),
+			SystemRDLVersion.Parse(2012),
+			SystemRDLVersion.Parse("12"),
+			SystemRDLVersion.Parse("2012"),
+		)
+
+		for version in versions:
+			self.assertIs(SystemRDLVersion.SystemRDL2012, version)
+
+		print()
+		print(version)
+		print(version.value)
+
+	def test_2019(self):
+		versions = (
+			SystemRDLVersion.Parse(17),
+			SystemRDLVersion.Parse(2017),
+			SystemRDLVersion.Parse("17"),
+			SystemRDLVersion.Parse("2017"),
+		)
+
+		for version in versions:
+			self.assertIs(SystemRDLVersion.SystemRDL2017, version)
+
+		print()
+		print(version)
+		print(version.value)
+
+	def test_IntError(self):
+		with self.assertRaises(ValueError):
+			_ = SystemRDLVersion.Parse(0)
+
+		with self.assertRaises(ValueError):
+			_ = SystemRDLVersion.Parse(13)
+
+	def test_StrError(self):
+		with self.assertRaises(ValueError):
+			_ = SystemRDLVersion.Parse("0")
+
+		with self.assertRaises(ValueError):
+			_ = SystemRDLVersion.Parse("13")