Fix too strict assertion regarding type of Reset statement

Ref. #946
AdaCore · Mar 3, 2022 · 8b15a8a · 8b15a8a
1 parent 1a060d8
commit 8b15a8a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/rflx/generator/session.py b/rflx/generator/session.py
@@ -2954,7 +2954,7 @@ def _reset(
         reset: stmt.Reset,
         is_global: Callable[[ID], bool],
     ) -> Sequence[Statement]:
-        assert isinstance(reset.type_, rty.Message)
+        assert isinstance(reset.type_, (rty.Message, rty.Sequence))
 
         target_type = ID(reset.type_.identifier)
         target_context = context_id(reset.identifier, is_global)

diff --git a/tests/integration/session_comprehension_on_sequence/generated/rflx-test-session.adb b/tests/integration/session_comprehension_on_sequence/generated/rflx-test-session.adb
@@ -397,6 +397,7 @@ is
          Ctx.P.Slots.Slot_Ptr_6 := Message_Options_Buffer;
          return;
       end if;
+      Universal.Options.Reset (Message_Options_Ctx);
       Ctx.P.Next_State := S_Send_1;
       pragma Warnings (Off, """Option_Types_Ctx"" is set by ""Take_Buffer"" but not used after the call");
       Universal.Option_Types.Take_Buffer (Option_Types_Ctx, Option_Types_Buffer);

diff --git a/tests/integration/session_comprehension_on_sequence/test.rflx b/tests/integration/session_comprehension_on_sequence/test.rflx
@@ -42,6 +42,8 @@ package Test is
          Message_2 := Universal::Message'(Message_Type => Universal::MT_Options,
                                           Length => Message_Options'Size / 8,
                                           Options => Message_Options);
+         -- §S-S-A-RS-V
+         Message_Options'Reset;
       transition
          goto Send_1 -- §S-S-T-N
       exception

diff --git a/tests/unit/generator_test.py b/tests/unit/generator_test.py
@@ -1747,6 +1747,10 @@ def variables(self) -> Sequence[expr.Variable]:
             stmt.Reset("X", type_=rty.Message("P::M")),
             "P.M.Reset (X_Ctx);",
         ),
+        (
+            stmt.Reset("X", type_=rty.Sequence("P::S", rty.Integer("A"))),
+            "P.S.Reset (X_Ctx);",
+        ),
         (
             stmt.Read("X", expr.Variable("Y", type_=rty.Message("P::M"))),
             "P.M.Verify_Message (Y_Ctx);",