Fix test-aggregation3

opengeode/AdaGenerator.py

@@ -205,7 +205,7 @@ LD_LIBRARY_PATH=. taste-gui -l
                                (name for name in process.mapping.iterkeys()
                                     if not name.endswith(u'START'))))
     reduced_statelist = {s for s in full_statelist if s not in parallel_states}
-    if parallel_states:
+    if aggregates:
         # Parallel states in a state aggregation may terminate
         full_statelist.add(u'{}finished'.format(UNICODE_SEP))
 

tests/regression/test-aggregation3/challenge.pr

@@ -2,12 +2,26 @@
 PROCESS challenge;
     STATE AGGREGATION Aggreg;
     SUBSTRUCTURE
-            /* CIF STATE (148, 125), (70, 35) */
             STATE A;
-            ENDSTATE;
-            /* CIF STATE (123, 267), (70, 35) */
+            SUBSTRUCTURE
+                    /* CIF START (42, 67), (70, 35) */
+                    START;
+                        /* CIF RETURN (59, 117), (35, 35) */
+                        RETURN ;
+            ENDSUBSTRUCTURE;
+            STATE B;
+            SUBSTRUCTURE
+                    /* CIF START (191, 90), (70, 35) */
+                    START;
+                        /* CIF RETURN (208, 140), (35, 35) */
+                        RETURN ;
+            ENDSUBSTRUCTURE;
+            /* CIF STATE (180, 246), (70, 35) */
             STATE B;
             ENDSTATE;
+            /* CIF STATE (178, 174), (70, 35) */
+            STATE A;
+            ENDSTATE;
     ENDSUBSTRUCTURE;
     /* CIF TEXT (80, 0), (298, 56) */
     -- This system tests nested states
@@ -20,7 +34,7 @@ dcl result T_uint32 :=0;
         CALL writeln('1');
         /* CIF NEXTSTATE (88, 181), (70, 35) */
         NEXTSTATE OFF;
-    /* CIF STATE (290, 148), (82, 35) */
+    /* CIF STATE (290, 148), (84, 35) */
     STATE Aggreg;
     ENDSTATE;
     /* CIF STATE (88, 181), (70, 35) */
@@ -29,7 +43,7 @@ dcl result T_uint32 :=0;
         INPUT run;
             /* CIF PROCEDURECALL (69, 286), (107, 35) */
             CALL writeln('2');
-            /* CIF NEXTSTATE (81, 336), (82, 35) */
+            /* CIF NEXTSTATE (81, 336), (84, 35) */
             NEXTSTATE Aggreg;
     ENDSTATE;
 ENDPROCESS challenge;
\ No newline at end of file