From 5823425e1239a47b4a605979ed5e15cd3c5e16be Mon Sep 17 00:00:00 2001
From: Christian Menard <christian.menard@tu-dresden.de>
Date: Mon, 27 Sep 2021 10:11:56 +0200
Subject: [PATCH] Support after on connections composed of multiple single
 ports

---
 org.lflang/src/org/lflang/ASTUtils.xtend | 23 +++++--------
 test/C/src/multiport/PipelineAfter.lf    | 43 ++++++++++++++++++++++++
 test/Cpp/src/multiport/PipelineAfter.lf  | 43 ++++++++++++++++++++++++
 3 files changed, 95 insertions(+), 14 deletions(-)
 create mode 100644 test/C/src/multiport/PipelineAfter.lf
 create mode 100644 test/Cpp/src/multiport/PipelineAfter.lf

diff --git a/org.lflang/src/org/lflang/ASTUtils.xtend b/org.lflang/src/org/lflang/ASTUtils.xtend
index d8c1b9aa83..7afe6ba544 100644
--- a/org.lflang/src/org/lflang/ASTUtils.xtend
+++ b/org.lflang/src/org/lflang/ASTUtils.xtend
@@ -173,24 +173,19 @@ class ASTUtils {
     }
     
     /**
-     * Return true if any port on the left or right of the connection involves
-     * a bank of reactors or a multiport.
+     * Return true if the connection involves multiple ports on the left or right side of the connection, or
+     * if the port on the left or right of the connection involves a bank of reactors or a multiport.
      * @param connection The connection.
      */
     private static def boolean isWide(Connection connection) {
-        for (leftPort : connection.leftPorts) {
-            if ((leftPort.variable as Port).widthSpec !== null
-                || leftPort.container?.widthSpec !== null
-            ) {
-                return true
-            }
+        if (connection.leftPorts.size > 1 || connection.rightPorts.size > 1) {
+            return true;
         }
-        for (rightPort : connection.rightPorts) {
-            if ((rightPort.variable as Port).widthSpec !== null
-                || rightPort.container?.widthSpec !== null
-            ) {
-                return true
-            }
+        val leftPort = connection.leftPorts.get(0);
+        val rightPort = connection.rightPorts.get(0);
+        if ((leftPort.variable as Port).widthSpec !== null || leftPort.container?.widthSpec !== null ||
+            (rightPort.variable as Port).widthSpec !== null || rightPort.container?.widthSpec !== null) {
+            return true
         }
         return false
     }
diff --git a/test/C/src/multiport/PipelineAfter.lf b/test/C/src/multiport/PipelineAfter.lf
new file mode 100644
index 0000000000..af3dc44c79
--- /dev/null
+++ b/test/C/src/multiport/PipelineAfter.lf
@@ -0,0 +1,43 @@
+target C;
+
+reactor Source {
+    output out:unsigned;
+    
+    reaction (startup) -> out {=
+        SET(out, 40);
+    =}
+}
+
+reactor Compute {
+    input in:unsigned;
+    output out:unsigned;
+    
+    reaction (in) -> out {=
+        SET(out, in->value + 2);
+    =}
+}
+
+reactor Sink {
+    input in:unsigned;
+    
+    reaction (in) {=
+        printf("Received %d\n", in->value);
+        if (in->value != 42) {
+            printf("ERROR: expected 42!\n");
+            exit(1);
+        }
+        if (get_elapsed_logical_time() != SEC(1)) {
+            printf("ERROR: Expected to receive input after one second.\n");
+            exit(2);
+        }
+    =}
+    
+}
+
+main reactor {
+    source = new Source();
+    compute = new Compute();
+    sink = new Sink();
+
+    source.out, compute.out -> compute.in, sink.in after 500 msec;
+}
\ No newline at end of file
diff --git a/test/Cpp/src/multiport/PipelineAfter.lf b/test/Cpp/src/multiport/PipelineAfter.lf
new file mode 100644
index 0000000000..976672b7d7
--- /dev/null
+++ b/test/Cpp/src/multiport/PipelineAfter.lf
@@ -0,0 +1,43 @@
+target Cpp;
+
+reactor Source {
+    output out:unsigned;
+    
+    reaction (startup) -> out {=
+        out.set(40);
+    =}
+}
+
+reactor Compute {
+    input in:unsigned;
+    output out:unsigned;
+    
+    reaction (in) -> out {=
+        out.set(*in.get() + 2);
+    =}
+}
+
+reactor Sink {
+    input in:unsigned;
+    
+    reaction (in) {=
+        std::cout << "Received " << *in.get() << '\n';
+        if (*in.get() != 42) {
+            std::cerr << "Error: expected 42!\n";
+            exit(1);
+        }
+        if (get_elapsed_logical_time() != 1s) {
+            std::cerr << "ERROR: Expected to receive input after 1 second.\n";
+            exit(2);
+        }
+    =}
+    
+}
+
+main reactor {
+    source = new Source();
+    compute = new Compute();
+    sink = new Sink();
+
+    source.out, compute.out -> compute.in, sink.in after 500 msec;
+}
\ No newline at end of file