Fix mishandled implicit boolean assignment for donttest/dontcompare p…

…roperties. #167
SystemRDL · Apr 10, 2023 · eaaff7c · eaaff7c
1 parent a0153ac
commit eaaff7c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/systemrdl/__about__.py b/systemrdl/__about__.py
@@ -1 +1 @@
-__version__ = "1.25.5"
+__version__ = "1.25.6"
diff --git a/systemrdl/properties/builtin.py b/systemrdl/properties/builtin.py
@@ -5,6 +5,7 @@
 from .. import component as comp
 from .. import node as m_node
 from ..ast.cast import AssignmentCast
+from ..ast.ast_node import ASTNode
 from .. import rdltypes
 
 if TYPE_CHECKING:
@@ -64,8 +65,10 @@ def assign_value(self, comp_def: comp.Component, value: Any, src_ref: 'SourceRef
         # If assigned to any other components, exclusively cast it to a boolean
         if not isinstance(comp_def, comp.Field):
             value = comp_def.properties[self.get_name()]
-            value = AssignmentCast(self.env, src_ref, value, bool)
-            comp_def.properties[self.get_name()] = value
+            if isinstance(value, ASTNode):
+                # was not an implicit True assignment
+                value = AssignmentCast(self.env, src_ref, value, bool)
+                comp_def.properties[self.get_name()] = value
 
     def validate(self, node: m_node.Node, value: Any) -> None:
         donttest = node.get_property('donttest')
@@ -145,8 +148,10 @@ def assign_value(self, comp_def: comp.Component, value: Any, src_ref: 'SourceRef
         # If assigned to any other components, exclusively cast it to a boolean
         if not isinstance(comp_def, comp.Field):
             value = comp_def.properties[self.get_name()]
-            value = AssignmentCast(self.env, src_ref, value, bool)
-            comp_def.properties[self.get_name()] = value
+            if isinstance(value, ASTNode):
+                # was not an implicit True assignment
+                value = AssignmentCast(self.env, src_ref, value, bool)
+                comp_def.properties[self.get_name()] = value
 
     def validate(self, node: m_node.Node, value: Any) -> None:
         if isinstance(node, m_node.FieldNode):