Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
OpenGEODE
Commits
4775e60a
Commit
4775e60a
authored
Mar 28, 2016
by
Maxime Perrotin
Browse files
Rename continuous signal branches in nested states
parent
16c9af30
Changes
3
Hide whitespace changes
Inline
Side-by-side
opengeode/Helper.py
View file @
4775e60a
...
...
@@ -380,11 +380,16 @@ def _rename_automaton(ast, from_name, to_name):
for
each
in
ast
.
floating_labels
:
rename_everything
(
each
,
from_name
,
to_name
)
for
each
in
ast
.
states
:
for
inp
in
each
.
inputs
:
for
inp
in
chain
(
each
.
inputs
,
each
.
continuous_signals
,
each
.
connects
)
:
rename_everything
(
inp
.
transition
,
from_name
,
to_name
)
for
idx
,
param
in
enumerate
(
inp
.
parameters
):
if
param
.
lower
()
==
from_name
.
lower
():
inp
.
parameters
[
idx
]
=
to_name
try
:
rename_everything
(
inp
.
trigger
,
from_name
,
to_name
)
except
AttributeError
:
# only for continuous signals
pass
if
each
.
composite
:
rename_everything
(
each
.
composite
.
content
,
from_name
,
to_name
)
for
each
in
ast
.
inner_procedures
:
...
...
tests/regression/test-battery/Makefile
View file @
4775e60a
...
...
@@ -12,7 +12,7 @@ test-ada:
$(OPENGEODE)
og.pr
--toAda
$(ASN1SCC)
-Ada
dataview-uniq.asn
-typePrefix
asn1Scc
-equal
$(GNATMAKE)
-O
$(O)
-c
*
.adb
$(GNATBIND)
-n
og
.ali
$(GNATBIND)
-n
car
.ali
test-c
:
$(OPENGEODE)
og.pr
--toC
...
...
tests/regression/test-battery/og.pr
View file @
4775e60a
...
...
@@ -6,7 +6,7 @@ use dv comment 'dataview-uniq.asn';
--use dv2 comment 'dataview2.asn';
signal dd(
Type2
);
signal dd(
MyInteger
);
signal we(Some_Thing);
procedure hehe;
...
...
@@ -39,21 +39,29 @@ external;
NEXTSTATE discharge;
/* CIF STATE (152, 197), (114, 35) */
STATE discharge;
/* CIF PROVIDED (
148
, 252), (121, 35) */
/* CIF PROVIDED (
32
, 252), (121, 35) */
PROVIDED charge = 0;
/* CIF RETURN (191, 302), (35, 35) */
/* CIF TASK (41, 302), (104, 35) */
TASK charge := 5;
/* CIF RETURN (75, 352), (35, 35) */
RETURN battery_discharged;
/* CIF INPUT (323, 252), (108, 35) */
INPUT dd(charge);
/* CIF TASK (265, 302), (223, 35) */
TASK charge := (charge + 1) mod 255;
/* CIF NEXTSTATE (342, 352), (70, 35) */
NEXTSTATE -;
ENDSTATE;
ENDSUBSTRUCTURE;
/* CIF START (315, 314), (70, 35) */
START;
/* CIF NEXTSTATE (307, 364), (85, 35) */
NEXTSTATE battery;
/* CIF STATE (
396, 412
), (98, 35) */
/* CIF STATE (
564, 510
), (98, 35) */
STATE battery;
/* CIF CONNECT (
445, 467
), (0, 35) */
/* CIF CONNECT (
613, 565
), (0, 35) */
CONNECT battery_discharged;
/* CIF RETURN (
427, 517
), (35, 35) */
/* CIF RETURN (
595, 615
), (35, 35) */
RETURN battery_discharged;
ENDSTATE;
ENDSUBSTRUCTURE;
...
...
@@ -61,16 +69,16 @@ external;
START;
/* CIF NEXTSTATE (140, 266), (100, 35) */
NEXTSTATE nominal;
/* CIF STATE (282, 264), (100, 35) */
/* CIF STATE (614, 272), (95, 35) */
STATE backup;
ENDSTATE;
/* CIF STATE (422, 480), (100, 35) */
STATE nominal;
/* CIF CONNECT (
33
2,
319
), (0, 35) */
/* CIF CONNECT (
47
2,
535
), (0, 35) */
CONNECT battery_discharged;
/* CIF NEXTSTATE (2
8
4,
369
), (95, 35) */
/* CIF NEXTSTATE (
4
24,
585
), (95, 35) */
NEXTSTATE backup;
ENDSTATE;
/* CIF STATE (614, 272), (95, 35) */
STATE backup;
ENDSTATE;
ENDPROCESS car;
ENDBLOCK;
ENDSYSTEM;
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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