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

Author: mattias-mohlin

.gitignore

@@ -2,6 +2,8 @@
 **/.vscode/art_diagram_settings.json
 **/.vscode/settings.json
 **/.vscode/launch.json
+**/.vscode/c_cpp_properties.json
+**/compile_commands.json
 **/logs/
 **/log*.txt
 **/node_modules/

art-comp-test/tests/hierarchy_folders/Capsules/Pinger.art

@@ -0,0 +1,26 @@
+capsule Pinger {
+    [[rt::decl]]
+    `
+        private: int count = 0;
+    `
+    service behavior port pingPort : Proto;
+    statemachine {
+        state State1 {
+            stop: on pingPort.pong when `count >= N_ITERATIONS`
+            `
+                std::cout << "Completed " << N_ITERATIONS << " iterations\n";
+                context()->abort();
+            `;
+            pong: on pingPort.pong
+            `
+                std::cout << getName() << " sends ping\n";
+                pingPort.ping(++count).send();
+            `;
+        };
+        initial -> State1
+        `
+            std::cout << getName() << " sends ping\n";
+            pingPort.ping(++count).send();
+        `;
+    };
+};

art-comp-test/tests/hierarchy_folders/Capsules/Ponger.art

@@ -0,0 +1,14 @@
+capsule Ponger {
+    service behavior port pongPort~ : Proto;
+    statemachine {
+        state State1 {
+            ping: on pongPort.ping
+            `
+            int i = *((int*) rtdata);
+            std::cout << getName() << " sends pong (count=" << i << ")" << std::endl;
+            pongPort.pong().send();
+            `;
+        };
+        initial -> State1;
+    };
+};

art-comp-test/tests/hierarchy_folders/Protocols/Proto.art

@@ -0,0 +1,4 @@
+protocol Proto {
+    in pong();
+    out ping(`int`);
+};

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

@@ -0,0 +1,9 @@
+
+capsule Top {
+    part ping : Pinger, pong : Ponger;
+    connect ping.pingPort with pong.pongPort;
+    statemachine {
+        state State1;
+        initial -> State1;
+    };
+};

art-comp-test/tests/hierarchy_folders/include/MyLimits.h

@@ -0,0 +1,8 @@
+#ifndef MyLimits_h
+#define MyLimits_h
+
+enum {
+    N_ITERATIONS = 7
+};
+
+#endif

art-comp-test/tests/hierarchy_folders/stdout.txt

@@ -0,0 +1,15 @@
+ping sends ping
+pong sends pong (count=1)
+ping sends ping
+pong sends pong (count=2)
+ping sends ping
+pong sends pong (count=3)
+ping sends ping
+pong sends pong (count=4)
+ping sends ping
+pong sends pong (count=5)
+ping sends ping
+pong sends pong (count=6)
+ping sends ping
+pong sends pong (count=7)
+Completed 7 iterations

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

@@ -0,0 +1,4 @@
+---
+group: cpp_code_generation
+---
+Art files are organized into subfolders. Check that generated application still builds and works fine.

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

@@ -0,0 +1,8 @@
+let tc = TCF.define(TCF.ART_TO_CPP);
+tc.topCapsule = "Top";
+tc.cppCodeStandard = "C++ 17";
+tc.targetFolder = 'hierarchy_folders_target';
+tc.commonPreface = `
+#include <iostream>
+#include "MyLimits.h"
+`;

art-comp-test/tests/hierarchy_folders_02/Capsules/Pinger.art

@@ -0,0 +1,26 @@
+capsule Pinger {
+    [[rt::decl]]
+    `
+        private: int count = 0;
+    `
+    service behavior port pingPort : Proto;
+    statemachine {
+        state State1 {
+            stop: on pingPort.pong when `count >= N_ITERATIONS`
+            `
+                std::cout << "Completed " << N_ITERATIONS << " iterations\n";
+                context()->abort();
+            `;
+            pong: on pingPort.pong
+            `
+                std::cout << getName() << " sends ping\n";
+                pingPort.ping(++count).send();
+            `;
+        };
+        initial -> State1
+        `
+            std::cout << getName() << " sends ping\n";
+            pingPort.ping(++count).send();
+        `;
+    };
+};