Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
OpenGEODE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
TASTE
OpenGEODE
Commits
0dfce2cb
Commit
0dfce2cb
authored
Mar 27, 2016
by
Maxime Perrotin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix test-aggregation3
parent
a1225044
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
6 deletions
+20
-6
opengeode/AdaGenerator.py
opengeode/AdaGenerator.py
+1
-1
tests/regression/test-aggregation3/challenge.pr
tests/regression/test-aggregation3/challenge.pr
+19
-5
No files found.
opengeode/AdaGenerator.py
View file @
0dfce2cb
...
...
@@ -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_st
ates
:
if
aggreg
ates
:
# Parallel states in a state aggregation may terminate
full_statelist
.
add
(
u'{}finished'
.
format
(
UNICODE_SEP
))
...
...
tests/regression/test-aggregation3/challenge.pr
View file @
0dfce2cb
...
...
@@ -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), (8
2
, 35) */
/* CIF STATE (290, 148), (8
4
, 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), (8
2
, 35) */
/* CIF NEXTSTATE (81, 336), (8
4
, 35) */
NEXTSTATE Aggreg;
ENDSTATE;
ENDPROCESS challenge;
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment