Correctly handle enumeration literals in PyRFLX

Closes #865

rflx/pyrflx/typevalue.py

@@ -41,6 +41,7 @@
     Sequence,
     Type,
 )
+from rflx.model.type_ import enum_literals
 from rflx.pyrflx.bitstring import Bitstring
 from rflx.pyrflx.error import PyRFLXError
 
@@ -571,19 +572,10 @@ def __init__(
             }
         )
 
-        self.__type_literals: ty.Mapping[Name, Expr] = (
-            state.type_literals
-            if state and state.type_literals
-            else {
-                k: v
-                for t in (
-                    f.typeval.literals
-                    for f in self._fields.values()
-                    if isinstance(f.typeval, EnumValue)
-                )
-                for k, v in t.items()
-            }
-        )
+        self.__type_literals: ty.Mapping[Name, Expr] = {
+            Variable(l): e.literals[l.name]
+            for l, e in enum_literals(self._type.types.values(), self._type.package).items()
+        }
 
         self.__additional_enum_literals: ty.Dict[Name, Expr] = {}
         self.__message_first_name = First("Message")
@@ -886,10 +878,15 @@ def set_refinement(fld: MessageValue.Field, fld_name: str) -> None:
                         fld.typeval.set_refinement(ref.sdu)
 
         def check_outgoing_condition_satisfied() -> None:
-            if all(
-                self.__simplified(o.condition) == FALSE
-                for o in self._type.outgoing(Field(field_name))
-            ):
+            simplified = [
+                self.__simplified(o.condition) for o in self._type.outgoing(Field(field_name))
+            ]
+            unresolved = [o for o in simplified if o not in (FALSE, TRUE)]
+            error_msg = ", ".join([str(o) for o in unresolved])
+            assert (
+                not unresolved
+            ), f"unresolved field conditions in {self.model.name}.{field_name}: {error_msg}"
+            if all(o == FALSE for o in simplified):
                 self._fields[field_name].typeval.clear()
                 raise PyRFLXError(
                     f"none of the field conditions "

tests/data/specs/parameterized.rflx

@@ -4,7 +4,7 @@ package Parameterized is
    type Tag is (Tag_A, Tag_B) with Size => 8;
    type Tag_Mode is (With_Tag, Without_Tag) with Size => 8;
 
-   type Message (Length : Length; Tag_Mode : Tag_Mode; Tag_Value : Tag) is
+   type Message (Length : Length; Tag_Mode : Tag_Mode; Use_Tag : Boolean; Tag_Value : Tag) is
       message
          Payload : Opaque
             with Size => Length * 8
@@ -14,7 +14,7 @@ package Parameterized is
                if Tag_Mode = Without_Tag;
          Tag : Tag
             then null
-               if Tag = Tag_Value;
+               if Tag = Tag_Value and Use_Tag = True;
       end message;
 
 end Parameterized;

tests/data/validator/parameterized/message/invalid/parameterized_message_excess_parameter.yaml

@@ -2,3 +2,4 @@ Length: 2
 Tag_Mode: With_Tag
 Tag_Value: Tag_A
 Excess: 42
+Use_Tag: True

tests/data/validator/parameterized/message/invalid/parameterized_message_missing_parameter.yaml

@@ -1,3 +1,3 @@
 Length: 2
 Tag_Value: Tag_A
-Tag_Mode: Without_Tag
+Use_Tag: True

tests/data/validator/parameterized/message/valid/parameterized_message.yaml

@@ -1,3 +1,4 @@
 Length: 2
 Tag_Mode: With_Tag
 Tag_Value: Tag_A
+Use_Tag: True

tests/unit/pyrflx_test.py

@@ -1372,7 +1372,7 @@ def test_get_model(icmp_message_value: MessageValue) -> None:
 
 def test_parameterized_message(parameterized_package: Package) -> None:
     message = parameterized_package.new_message(
-        "Message", {"Length": 8, "Has_Tag": False, "Tag_Value": "Tag_A"}
+        "Message", {"Length": 8, "Tag_Mode": "Without_Tag", "Tag_Value": "Tag_A", "Use_Tag": True}
     )
     assert message.fields == ["Payload", "Tag"]
     assert message.required_fields == ["Payload"]
@@ -1389,7 +1389,7 @@ def test_parameterized_message_no_verification() -> None:
         skip_message_verification=True,
     )
     message_unv = pyrflx_.package("Parameterized").new_message(
-        "Message", {"Length": 8, "Has_Tag": False, "Tag_Value": "Tag_A"}
+        "Message", {"Length": 8, "Tag_Mode": "Without_Tag", "Tag_Value": "Tag_A", "Use_Tag": True}
     )
     assert message_unv.fields == ["Payload", "Tag"]
     message_unv.set("Payload", bytes(8))

tests/unit/validator_test.py

@@ -624,7 +624,7 @@ def test_parameterized_message_missing_parameter() -> None:
         match=(
             r"^"
             f"{TEST_DIR}/parameterized/message/invalid/parameterized_message_missing_parameter.raw:"
-            r" pyrflx: error: missing parameter values: Has_Tag"
+            r" pyrflx: error: missing parameter values: Tag_Mode"
             r"$"
         ),
     ):