Commit 0dfce2cb authored by Maxime Perrotin's avatar Maxime Perrotin
Browse files

Fix test-aggregation3

parent a1225044
...@@ -205,7 +205,7 @@ LD_LIBRARY_PATH=. taste-gui -l ...@@ -205,7 +205,7 @@ LD_LIBRARY_PATH=. taste-gui -l
(name for name in process.mapping.iterkeys() (name for name in process.mapping.iterkeys()
if not name.endswith(u'START')))) if not name.endswith(u'START'))))
reduced_statelist = {s for s in full_statelist if s not in parallel_states} 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 # Parallel states in a state aggregation may terminate
full_statelist.add(u'{}finished'.format(UNICODE_SEP)) full_statelist.add(u'{}finished'.format(UNICODE_SEP))
......
...@@ -2,12 +2,26 @@ ...@@ -2,12 +2,26 @@
PROCESS challenge; PROCESS challenge;
STATE AGGREGATION Aggreg; STATE AGGREGATION Aggreg;
SUBSTRUCTURE SUBSTRUCTURE
/* CIF STATE (148, 125), (70, 35) */
STATE A; STATE A;
ENDSTATE; SUBSTRUCTURE
/* CIF STATE (123, 267), (70, 35) */ /* 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; STATE B;
ENDSTATE; ENDSTATE;
/* CIF STATE (178, 174), (70, 35) */
STATE A;
ENDSTATE;
ENDSUBSTRUCTURE; ENDSUBSTRUCTURE;
/* CIF TEXT (80, 0), (298, 56) */ /* CIF TEXT (80, 0), (298, 56) */
-- This system tests nested states -- This system tests nested states
...@@ -20,7 +34,7 @@ dcl result T_uint32 :=0; ...@@ -20,7 +34,7 @@ dcl result T_uint32 :=0;
CALL writeln('1'); CALL writeln('1');
/* CIF NEXTSTATE (88, 181), (70, 35) */ /* CIF NEXTSTATE (88, 181), (70, 35) */
NEXTSTATE OFF; NEXTSTATE OFF;
/* CIF STATE (290, 148), (82, 35) */ /* CIF STATE (290, 148), (84, 35) */
STATE Aggreg; STATE Aggreg;
ENDSTATE; ENDSTATE;
/* CIF STATE (88, 181), (70, 35) */ /* CIF STATE (88, 181), (70, 35) */
...@@ -29,7 +43,7 @@ dcl result T_uint32 :=0; ...@@ -29,7 +43,7 @@ dcl result T_uint32 :=0;
INPUT run; INPUT run;
/* CIF PROCEDURECALL (69, 286), (107, 35) */ /* CIF PROCEDURECALL (69, 286), (107, 35) */
CALL writeln('2'); CALL writeln('2');
/* CIF NEXTSTATE (81, 336), (82, 35) */ /* CIF NEXTSTATE (81, 336), (84, 35) */
NEXTSTATE Aggreg; NEXTSTATE Aggreg;
ENDSTATE; ENDSTATE;
ENDPROCESS challenge; ENDPROCESS challenge;
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment