Merge pull request #713 from lf-lang/python-iteratable-multiports

Python iterable multiports

test/Python/src/multiport/BankToBankMultiport.lf

@@ -8,8 +8,8 @@ reactor Source(width(1)) {
     output[width] out;
     state s(0);
     reaction(t) -> out {=
-        for i in range(len(out)):
-            out[i].set(self.s)
+        for port in out:
+            port.set(self.s)
             self.s += 1
     =}
 }
@@ -18,9 +18,9 @@ reactor Destination(width(1)) {
     input[width] _in;
     reaction(_in) {=
         sm = 0
-        for i in range(len(_in)):
-            if _in[i].is_present is True:
-                sm += _in[i].value         
+        for port in _in:
+            if port.is_present:
+                sm += port.value         
 
         print("Sum of received: ", sm)
         if sm != self.s:

test/Python/src/multiport/BankToBankMultiportAfter.lf

@@ -3,39 +3,7 @@ target Python {
     timeout: 2 sec,
     fast: true
 };
-reactor Source(width(1)) {
-    timer t(0, 200 msec);
-    output[width] out;
-    state s(0);
-    reaction(t) -> out {=
-        for i in range(len(out)):
-            out[i].set(self.s)
-            self.s += 1
-    =}
-}
-reactor Destination(width(1)) {
-    state s(6);
-    input[width] _in;
-    reaction(_in) {=
-        sm = 0
-        for i in range(len(_in)):
-            if _in[i].is_present is True:
-                sm += _in[i].value
-        print("Sum of received: ", sm)
-        if sm != self.s:
-            sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
-            exit(1)
-
-        self.s += 16
-    =}
-    reaction(shutdown) {=
-        if self.s <= 6:
-            sys.stderr.write("ERROR: Destination received no input!\n")
-            exit(1)
-
-        print("Success.")
-    =}
-}
+import Source, Destination from "BankToBankMultiport.lf"
 main reactor BankToBankMultiportAfter(bank_width(4)) { 
 	a = new[bank_width] Source(width = 4);
 	b = new[bank_width] Destination(width = 4);

test/Python/src/multiport/BankToMultiport.lf

@@ -5,7 +5,6 @@ reactor Source(
     bank_index(0)
 ) {
     output out;
-
     reaction (startup) -> out {=
         out.set(self.bank_index)
     =}
@@ -16,12 +15,12 @@ reactor Sink(width(4)) {
     state received(false);
 
     reaction (_in) {=
-        for i in range(len(_in)):
-            if _in[i].is_present is True:
-                print("Received on channel {:d}: {:d}\n".format(i, _in[i].value))
+        for (idx, port) in enumerate(_in):
+            if port.is_present is True:
+                print("Received on channel {:d}: {:d}".format(idx, port.value))
                 self.received = True
-                if _in[i].value != i:
-                    sys.stderr.write("ERROR: expected {:d}\n".format(i))
+                if port.value != idx:
+                    sys.stderr.write("ERROR: expected {:d}\n".format(idx))
                     exit(1)
     =}
     reaction(shutdown) {=

test/Python/src/multiport/MultiportFromBank.lf

@@ -17,10 +17,10 @@ reactor Destination {
     input[3] _in;
     state received(0);
     reaction(_in) {=
-        for i in range(len(_in)):
-            print("Destination channel " + str(i) + " received " + str(_in[i].value))
-            if i != _in[i].value:
-                sys.stderr.write("ERROR: Expected " + str(i))
+        for (idx, port) in enumerate(_in):
+            print("Destination channel " + str(idx) + " received " + str(port.value))
+            if idx != port.value:
+                sys.stderr.write("ERROR: Expected " + str(idx))
                 exit(1)
 
         self.received = True

test/Python/src/multiport/MultiportFromBankHierarchy.lf

@@ -3,7 +3,8 @@
 target Python {
     timeout: 2 sec,
     fast: true
-}; 
+};
+import Destination from "MultiportFromBank.lf"
 reactor Source(
     bank_index(0)
 ) {
@@ -17,27 +18,6 @@ reactor Container {
     s = new[3] Source();
     s.out -> out;
 }
-reactor Destination {
-    input[3] _in;
-    state received(0);
-    reaction(_in) {=
-        for i in range(len(_in)):
-            print("Destination channel " + str(i) + " received " + str(_in[i].value));
-            if i != _in[i].value:
-                sys.stderr.write("ERROR: Expected "+ str(i) + ".\n")
-                exit(1)
-
-        self.received = True
-    =}
-    reaction(shutdown) {=
-        if self.received is not True:
-            sys.stderr.write("ERROR: Destination received no input!\n")
-            exit(1)
-
-        print("Success.")
-    =}
-}
-
 main reactor MultiportFromBankHierarchy {
     a = new Container();
     b = new Destination();

test/Python/src/multiport/MultiportFromBankHierarchyAfter.lf

@@ -4,41 +4,8 @@ target Python {
     timeout: 2 sec,
     fast: true
 }; 
-reactor Source(
-    bank_index(0)
-) {
-    output out;
-    reaction(startup) -> out {=
-        out.set(self.bank_index)
-    =}
-}
-reactor Container {
-    output[3] out;
-    s = new[3] Source();
-    s.out -> out;
-}
-reactor Destination {
-    input[3] _in;
-    state received(false);
-    reaction(_in) {=
-        for i in range(len(_in)):
-            print("Destination channel {:d} received {:d}.\n".format(i, _in[i].value))
-            if i != _in[i].value:
-                sys.stderr.write("ERROR: Expected {:d}.\n".format(i))
-                exit(1)
-        if get_elapsed_logical_time() != SEC(1):
-            sys.stderr.write("ERROR: Expected to receive input after one second.\n")
-            exit(2)
-        self.received = True
-    =}
-    reaction(shutdown) {=
-        if self.received is not True:
-            sys.stderr.write("ERROR: Destination received no input!\n")
-            exit(1)
-        print("Success.\n")
-    =}
-}
-
+import Container from "MultiportFromBankHierarchy.lf"
+import Destination from "MultiportFromBank.lf"
 main reactor MultiportFromBankHierarchyAfter {
     a = new Container();
     b = new Destination();

test/Python/src/multiport/MultiportFromHierarchy.lf

@@ -8,8 +8,8 @@ reactor Source {
     output[4] out;
     state s(0);
     reaction(t) -> out {=
-        for i in range(4):
-            out[i].set(self.s)
+        for port in out:
+            port.set(self.s)
             self.s = self.s + 1
     =}
 }
@@ -18,9 +18,9 @@ reactor Destination {
     input[4] _in;
     reaction(_in) {=
         sm = 0
-        for i in range(len(_in)):
-            if (_in[i].is_present):
-                sm += _in[i].value
+        for port in _in:
+            if port.is_present:
+                sm += port.value
         print("Sum of received: " + str(sm))
         if (sm != self.s):
             sys.stderr.write("ERROR: Expected " + str(self.s) + ".\n")

test/Python/src/multiport/MultiportFromReaction.lf

@@ -8,9 +8,9 @@ reactor Destination(width(1)) {
     input[width] _in;
     reaction(_in) {=
         sm = 0;
-        for i in range(len(_in)):
-            if _in[i].is_present:
-                sm += _in[i].value
+        for port in _in:
+            if port.is_present:
+                sm += port.value
         print("Sum of received: ", sm)
         if sm != self.s:
             sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
@@ -22,19 +22,19 @@ reactor Destination(width(1)) {
         if self.s <= 6:
             sys.stderr.write("ERROR: Destination received no input!\n")
             exit(1)
-        print("Success.\n")
+        print("Success.")
     =}
 }
 main reactor MultiportFromReaction {
     timer t(0, 200 msec);
     state s(0);
     b = new Destination(width = 4);
     reaction(t) -> b._in {=
-        for i in range(len(b._in)):
-            print("Before SET, b.in[{:d}].is_present has value {:d}".format(i, b._in[i].is_present))
-            b._in[i].set(self.s)
+        for (idx, port) in enumerate(b._in):
+            print("Before SET, b.in[{:d}].is_present has value {:d}".format(idx, port.is_present))
+            port.set(self.s)
             self.s += 1
-            print("AFTER set, b.in[{:d}].is_present has value {:d}".format(i, b._in[i].is_present))
-            print("AFTER set, b.in[{:d}].value has value {:d}".format(i, b._in[i].value))
+            print("AFTER set, b.in[{:d}].is_present has value {:d}".format(idx, port.is_present))
+            print("AFTER set, b.in[{:d}].value has value {:d}".format(idx, port.value))
     =}
 }

test/Python/src/multiport/MultiportIn.lf

@@ -26,8 +26,8 @@ reactor Destination {
     input[4] _in;
     reaction(_in) {=
         sum = 0
-        for i in range(len(_in)):
-            sum += _in[i].value
+        for port in _in:
+            sum += port.value
 
         print("Sum of received: " + str(sum))
         if sum != self.s:

test/Python/src/multiport/MultiportInParameterized.lf

@@ -26,8 +26,8 @@ reactor Destination(width(1)) {
     input[width] _in;
     reaction(_in) {=
         sm = 0
-        for i in range(len(_in)):
-            sm += _in[i].value
+        for port in _in:
+            sm += port.value
         print("Sum of received: ", sm)
         if sm != self.s:
             sys.stderr.write("ERROR: Expected {:d}.\n".format(self.s))
@@ -38,7 +38,7 @@ reactor Destination(width(1)) {
         if self.s == 0:
             sys.stderr.write("ERROR: Destination received no input!\n")
             exit(1)
-        print("Success.\n");
+        print("Success.");
     =}
 }
 

test/Python/src/multiport/MultiportMutableInput.lf

@@ -15,9 +15,9 @@ reactor Print(scale(1)) {
     input[2] _in;
     reaction(_in) {=
         expected = 42
-        for j in range(2):
-            print("Received on channel {:d}: ".format(j), _in[j].value)
-            if _in[j].value != expected:
+        for (idx, port) in enumerate(_in):
+            print("Received on channel {:d}: ".format(idx), port.value)
+            if port.value != expected:
                 sys.stderr.write("ERROR: Expected {:d}!\n".format(expected))
                 exit(1)
             expected *= 2
@@ -28,10 +28,10 @@ reactor Scale(scale(2)) {
     mutable input[2] _in;
     output[2] out;
     reaction(_in) -> out {=
-        for j in range(2):
+        for (idx, port) in enumerate(_in):
             # Modify the input, allowed because mutable.
-            _in[j].value *= self.scale
-            out[j].set(_in[j].value)
+            port.value *= self.scale
+            out[idx].set(port.value)
     =}
 }
 main reactor MultiportMutableInput {

test/Python/src/multiport/MultiportMutableInputArray.lf

@@ -15,9 +15,9 @@ reactor Source {
 reactor Print(scale(1)) {
     input[2] _in;
     reaction(_in) {=
-        for j in range(2):
-            print("Received on channel ", _in[j].value)
-            if _in[j].value != [(self.scale*i) for i in range(3*j,(3*j)+3)]:
+        for (idx, port) in enumerate(_in):
+            print("Received on channel ", port.value)
+            if port.value != [(self.scale*i) for i in range(3*idx,(3*idx)+3)]:
                 sys.stderr.write("ERROR: Value received by Print does not match expectation!\n")
                 exit(1)
     =}
@@ -27,11 +27,10 @@ reactor Scale(scale(2)) {
     mutable input[2] _in;
     output[2] out;
     reaction(_in) -> out {=
-        for j in range(len(_in)):
-            for i in range(len(_in[j].value)):
-                if (_in[j].is_present):
-                    _in[j].value[i] *= self.scale
-            out[j].set(_in[j].value)
+        for (idx, port) in enumerate(_in):
+            if port.is_present:
+                port.value = [value*self.scale for value in port.value]
+            out[idx].set(port.value)
     =}
 }
 

test/Python/src/multiport/MultiportOut.lf

@@ -8,8 +8,8 @@ reactor Source {
     output[4] out;
     state s(0);
     reaction(t) -> out {=
-        for i in range(0,4):
-            out[i].set(self.s)
+        for port in out:
+            port.set(self.s)
 
         self.s+=1
     =}
@@ -26,9 +26,9 @@ reactor Destination {
     input[4] _in;
     reaction(_in) {=
         sum = 0
-        for i in range(len(_in)):
-            if _in[i].is_present:
-                sum += _in[i].value
+        for port in _in:
+            if port.is_present:
+                sum += port.value
 
         print("Sum of received: " + str(sum))
         if sum != self.s:

test/Python/src/multiport/MultiportToBank.lf

@@ -6,8 +6,8 @@ target Python {
 reactor Source {
     output[3] out;
     reaction(startup) -> out {=
-        for i in range(len(out)):
-            out[i].set(i)
+        for (idx, port) in enumerate(out):
+            port.set(idx)
     =}
 }
 reactor Destination(

test/Python/src/multiport/MultiportToBankAfter.lf

@@ -3,13 +3,7 @@ target Python {
     timeout: 2 sec,
     fast: true
 }; 
-reactor Source {
-    output[3] out;
-    reaction(startup) -> out {=
-        for i in range(len(out)):
-            out[i].set(i);
-    =}
-}
+import Source from "MultiportToBank.lf"
 reactor Destination(
     bank_index(0)
 ) {