Merge branch 'main' of github01.hclpnp.com:Modeling/rtistic-pub-doc

Author: mattias-mohlin

art-comp-test/art-comp-test.code-workspace

@@ -155,6 +155,9 @@
         {
             "path": "tests/protocol_inheritance_redefined_event"
         },
+        {
+            "path": "tests/protocol_signals_array_sorted"
+        },
         {
             "path": "tests/receive_any"
         },

art-comp-test/tests/protocol_signals_array_sorted/Top.art

@@ -0,0 +1,68 @@
+protocol AlphaSorted {
+
+    in zTestSymmetric();
+    in zTestSymmetric2();
+    in rTest();
+    in ktest();
+    in mTest();
+    in aCap();
+    in bCap();
+    in aTest();
+
+    
+    out zTest();
+    out zTestSymmetric();
+    out zTestSymmetric2();
+    out rTest();
+    out ktest();
+    out mTest();
+    out aCap();
+    out bCap();
+    out aTest();
+    
+};
+capsule Top{
+
+
+    [[rt::header_preface]]
+    `
+        #include "testlib.art.h"
+        #include "AlphaSorted.h"
+
+    `
+    behavior port alphaAlphaSortedConj~ : AlphaSorted;    
+    behavior port alphaAlphaSorted : AlphaSorted;    
+
+    connect alphaAlphaSortedConj with alphaAlphaSorted;
+
+    statemachine {
+        state State1;
+        initial -> State1
+        `
+            const RTProtocolDescriptor& pdConj = alphaAlphaSortedConj.rt_class;
+            int i = pdConj.inSignalNamed("zTestSymmetric");
+            ASSERT(i == 4, "Event zTestSymmetric was not found at the expected index 4");
+            i = pdConj.outSignalNamed("zTestSymmetric");
+            ASSERT(i == 3, "Event zTestSymmetric was not found at the expected index 3");
+
+            i = pdConj.inSignalNamed("zTest");
+            ASSERT(i == 3, "Event zTest was not found at the expected index 3");
+            i = pdConj.outSignalNamed("aTest");
+            ASSERT(i == 10, "Event aTest was not found at the expected index 10");
+
+            const RTProtocolDescriptor& pd = alphaAlphaSorted.rt_class;
+            i = pd.inSignalNamed("zTestSymmetric");
+            ASSERT(i == 3, "Event zTestSymmetric was not found at the expected index 3");
+            i = pd.outSignalNamed("zTestSymmetric");
+            ASSERT(i == 4, "Event zTestSymmetric was not found at the expected index 4");
+
+            i = pd.inSignalNamed("aTest");
+            ASSERT(i == 10, "Event aTest was not found at the expected index 10");
+            i = pd.outSignalNamed("zTest");
+            ASSERT(i == 3, "Event zTest was not found at the expected index 3");
+            PASS();
+
+        `;
+    };
+
+};

art-comp-test/tests/protocol_signals_array_sorted/testcase.md

@@ -0,0 +1,8 @@
+---
+group: cpp_code_generation
+---
+This test ensures that protocol events are sorted alphabetically in the rt_signals array in the generated code. It shows how the TargetRTS functions RTProtocolDescriptor::inSignalNamed() and RTProtocolDescriptor::outSignalNamed() can be used for looking up the index of in-events and out-events in this array.
+
+
+
+

art-comp-test/tests/protocol_signals_array_sorted/top.tcjs

@@ -0,0 +1,4 @@
+let tc = TCF.define(TCF.CPP_TRANSFORM);
+tc.topCapsule = 'Top';
+tc.prerequisites = ["../../TestUtils/testlib.tcjs"];
+tc.targetFolder = 'protocol_signals_array_sorted_target';