Merge 0de6867 into 50a5c3c

leonardt · Jun 18, 2019 · fe84363 · fe84363
2 parents 50a5c3c + 0de6867
commit fe84363
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/hwtypes/adt.py b/hwtypes/adt.py
@@ -53,7 +53,7 @@ def value(self):
         return self._value
 
     def __repr__(self):
-        return f'{type(self).__name__}({",".join(map(repr, self.value))})'
+        return f'{type(self).__name__}({", ".join(map(repr, self.value))})'
 
 class Product(Tuple, metaclass=ProductMeta):
     def __new__(cls, *args, **kwargs):
@@ -68,7 +68,7 @@ def __new__(cls, *args, **kwargs):
             raise TypeError('Cannot instance unbound product type')
 
     def __repr__(self):
-        return f'{type(self).__name__}({",".join(map(repr, self.value))})'
+        return f'{type(self).__name__}({", ".join(f"{k}={v}" for k,v in self.value_dict)})'
 
     @property
     def value_dict(self):

diff --git a/hwtypes/fp_vector.py b/hwtypes/fp_vector.py
@@ -135,7 +135,7 @@ def __init_subclass__(cls, **kwargs):
 
 
     def __repr__(self):
-        return f'{self._value}'
+        return f'{type(self)}({self._value})'
 
     @set_context
     def fp_abs(self) -> 'FPVector':

diff --git a/hwtypes/smt_bit_vector.py b/hwtypes/smt_bit_vector.py
@@ -98,9 +98,10 @@ def __init__(self, value=SMYBOLIC, *, name=AUTOMATIC):
 
     def __repr__(self):
         if self._name is not AUTOMATIC:
-            return self._name
+            return f'{type(self)}({self._name})'
         else:
-            return repr(self._value)
+            return f'{type(self)}({self._value})'
+
     @property
     def value(self):
         return self._value
@@ -259,9 +260,9 @@ def num_bits(self):
 
     def __repr__(self):
         if self._name is not AUTOMATIC:
-            return self._name
+            return f'{type(self)}({self._name})'
         else:
-            return repr(self._value)
+            return f'{type(self)}({self._value})'
 
     def __getitem__(self, index):
         size = self.size
@@ -323,7 +324,7 @@ def __len__(self):
     def concat(self, other):
         T = type(self).unsized_t
         if not isinstance(other, T):
-            raise TypeError(f'value must of type {T}')
+            raise TypeError(f'value must of type {T} not {type(other)}')
         return T[self.size + other.size](smt.BVConcat(other.value, self.value))
 
     def bvnot(self):

diff --git a/hwtypes/z3_bit_vector.py b/hwtypes/z3_bit_vector.py
@@ -94,9 +94,10 @@ def __init__(self, value=SMYBOLIC, *, name=AUTOMATIC):
 
     def __repr__(self):
         if self._name is not AUTOMATIC:
-            return self._name
+            return f'{type(self)}({self._name})'
         else:
-            return repr(self._value)
+            return f'{type(self)}({self._value})'
+
     @property
     def value(self):
         return self._value
@@ -257,9 +258,9 @@ def num_bits(self):
 
     def __repr__(self):
         if self._name is not AUTOMATIC:
-            return self._name
+            return f'{type(self)}({self._name})'
         else:
-            return repr(self._value)
+            return f'{type(self)}({self._value})'
 
     def __getitem__(self, index):
         size = self.size