Enhance BitStringLiteral for binary, octal, decimal and hexadecimal.

Author: Paebbels

pyVHDLModel/Expression.py

@@ -34,7 +34,8 @@
 
 All declarations for literals, aggregates, operators forming an expressions.
 """
-from typing               import Tuple, List, Iterable, Union
+from enum                 import Flag
+from typing               import Tuple, List, Iterable, Union, ClassVar
 
 from pyTooling.Decorators import export, readonly
 
@@ -196,14 +197,32 @@ def __str__(self) -> str:
 		return "\"" + self._value + "\""
 
 
+@export
+class BitStringBase(Flag):
+	NoBase = 0
+	Binary = 2
+	Octal = 8
+	Decimal = 10
+	Hexadecimal = 16
+	Unsigned = 32
+	Signed = 64
+
+
 @export
 class BitStringLiteral(Literal):
+	# _base:  ClassVar[BitStringBase]
 	_value: str
+	_bits:   int
 
 	def __init__(self, value: str) -> None:
 		super().__init__()
+		self._bits = len(value)
 		self._value = value
 
+	@readonly
+	def Bits(self) -> int:
+		return self._bits
+
 	@readonly
 	def Value(self) -> str:
 		return self._value
@@ -212,6 +231,58 @@ def __str__(self) -> str:
 		return "\"" + self._value + "\""
 
 
+@export
+class BinaryBitStringLiteral(BitStringLiteral):
+	_base: ClassVar[BitStringBase] = BitStringBase.Binary
+
+	def __init__(self, value: str, bits: int = 0) -> None:
+		super().__init__(value)
+		if bits > 0:
+			self._bits = bits
+
+	def __str__(self) -> str:
+		return "b\"" + self._value + "\""
+
+
+@export
+class OctalBitStringLiteral(BitStringLiteral):
+	_base: ClassVar[BitStringBase] = BitStringBase.Octal
+
+	def __init__(self, value: str, bits: int = 0) -> None:
+		super().__init__(value)
+		if bits > 0:
+			self._bits = bits
+
+	def __str__(self) -> str:
+		return "o\"" + self._value + "\""
+
+
+@export
+class DecimalBitStringLiteral(BitStringLiteral):
+	_base: ClassVar[BitStringBase] = BitStringBase.Decimal
+
+	def __init__(self, value: str, bits: int = 0) -> None:
+		super().__init__(value)
+		if bits > 0:
+			self._bits = bits
+
+	def __str__(self) -> str:
+		return "d\"" + self._value + "\""
+
+
+@export
+class HexadecimalBitStringLiteral(BitStringLiteral):
+	_base: ClassVar[BitStringBase] = BitStringBase.Hexadecimal
+
+	def __init__(self, value: str, bits: int = 0) -> None:
+		super().__init__(value)
+		if bits > 0:
+			self._bits = bits
+
+	def __str__(self) -> str:
+		return "x\"" + self._value + "\""
+
+
 @export
 class ParenthesisExpression: #(Protocol):
 	__slots__ = ()  # FIXME: use ExtendedType?

pyVHDLModel/__init__.py

@@ -48,7 +48,7 @@
 __email__ =     "[email protected]"
 __copyright__ = "2016-2025, Patrick Lehmann"
 __license__ =   "Apache License, Version 2.0"
-__version__ =   "0.31.3"
+__version__ =   "0.32.0"
 
 
 from enum                      import unique, Enum, Flag, auto