Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[342] trunk
|
From: <got...@us...> - 2009-09-19 12:18:23
|
Revision: 342
http://scstudio.svn.sourceforge.net/scstudio/?rev=342&view=rev
Author: gotthardp
Date: 2009-09-19 12:18:13 +0000 (Sat, 19 Sep 2009)
Log Message:
-----------
Z120 export has been changed: unused MSC labels are no longer printed. Update the Z120 tests accordingly.
Modified Paths:
--------------
trunk/src/data/Z120/z120_save.cpp
trunk/tests/z120_test/z120_test00.mpr.result
trunk/tests/z120_test/z120_test03.mpr.result
trunk/tests/z120_test/z120_test08.mpr
trunk/tests/z120_test/z120_test08.mpr.result
trunk/tests/z120_test/z120_test11.mpr
trunk/tests/z120_test/z120_test11.mpr.result
trunk/tests/z120_test/z120_test12.mpr
trunk/tests/z120_test/z120_test12.mpr.result
trunk/tests/z120_test/z120_test13.mpr.result
trunk/tests/z120_test/z120_test14.mpr.result
trunk/tests/z120_test/z120_test15.mpr.result
trunk/tests/z120_test/z120_test32.mpr.result
trunk/tests/z120_test/z120_test33.mpr.result
trunk/tests/z120_test/z120_test34.mpr.result
trunk/tests/z120_test/z120_test35.mpr.result
trunk/tests/z120_test/z120_test45.mpr.result
trunk/tests/z120_test/z120_test47.mpr.result
trunk/tests/z120_test/z120_test51.mpr.result
trunk/tests/z120_test/z120_test54.mpr.result
trunk/tests/z120_test/z120_test55.mpr.result
trunk/tests/z120_test/z120_test58.mpr.result
trunk/tests/z120_test/z120_test59.mpr.result
Modified: trunk/src/data/Z120/z120_save.cpp
===================================================================
--- trunk/src/data/Z120/z120_save.cpp 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/src/data/Z120/z120_save.cpp 2009-09-19 12:18:13 UTC (rev 342)
@@ -284,7 +284,7 @@
// check if the label needs to be printed
// - label is required for time constrained events
if(!event->get_time_relations().empty())
- stream << "label e" << event_id_map.get_id(event) << "; " << std::endl;
+ stream << "label e" << event_id_map.get_id(event) << ";" << std::endl;
print_event(stream, message_id_map, event);
stream << ";" << std::endl;
@@ -314,7 +314,7 @@
// - label is required for referenced coregion events
// - label is required for time constrained events
if(!(*epos)->get_predecessors().empty() || !(*epos)->get_time_relations().empty())
- stream << "label e" << event_id_map.get_id(*epos) << "; " << std::endl;
+ stream << "label e" << event_id_map.get_id(*epos) << ";" << std::endl;
print_event(stream, message_id_map, *epos);
Modified: trunk/tests/z120_test/z120_test00.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test00.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test00.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -8,8 +8,8 @@
in A,0 from found;
out jedna,1 to B;
concurrent;
-label e0; out B1,2 to B;
-label e1; out B,3 to lost;
+out B1,2 to B;
+out B,3 to lost;
endconcurrent;
in jedna,4 from B;
endinstance;
Modified: trunk/tests/z120_test/z120_test03.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test03.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test03.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -8,8 +8,8 @@
in A,0 from found;
out jedna,1 to B;
concurrent;
-label e0; out B1,2 to B;
-label e1; out B,3 to lost;
+out B1,2 to B;
+out B,3 to lost;
endconcurrent;
endinstance;
B: instance;
Modified: trunk/tests/z120_test/z120_test08.mpr
===================================================================
--- trunk/tests/z120_test/z120_test08.mpr 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test08.mpr 2009-09-19 12:18:13 UTC (rev 342)
@@ -7,8 +7,9 @@
inst NAME2;
NAME1: instance;
concurrent;
-label e1; out b,1 to NAME2 before e0;
-label e0; in a,0 from NAME2;
+out b,1 to NAME2 before e0;
+label e0;
+in a,0 from NAME2;
endconcurrent;
endinstance;
NAME2: instance;
Modified: trunk/tests/z120_test/z120_test08.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test08.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test08.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -6,8 +6,9 @@
inst NAME2;
NAME1: instance;
concurrent;
-label e0; out b,0 to NAME2 before e1;
-label e1; in a,1 from NAME2;
+out b,0 to NAME2 before e0;
+label e0;
+in a,1 from NAME2;
endconcurrent;
endinstance;
NAME2: instance;
Modified: trunk/tests/z120_test/z120_test11.mpr
===================================================================
--- trunk/tests/z120_test/z120_test11.mpr 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test11.mpr 2009-09-19 12:18:13 UTC (rev 342)
@@ -19,9 +19,10 @@
out SYNACK,1 to PC;
in ACK,2 from PC;
concurrent;
-label e0; in request_a,3 from PC before e1;
-label e2; in request_b,4 from PC;
-label e1; out result,5 to PC;
+in request_a,3 from PC before e0;
+in request_b,4 from PC;
+label e0;
+out result,5 to PC;
endconcurrent;
endinstance;
endmsc;
Modified: trunk/tests/z120_test/z120_test11.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test11.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test11.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -17,9 +17,10 @@
out SYNACK,1 to PC;
in ACK,2 from PC;
concurrent;
-label e0; in request_a,3 from PC before e1;
-label e2; in request_b,4 from PC;
-label e1; out result,5 to PC;
+in request_a,3 from PC before e0;
+in request_b,4 from PC;
+label e0;
+out result,5 to PC;
endconcurrent;
endinstance;
endmsc;
Modified: trunk/tests/z120_test/z120_test12.mpr
===================================================================
--- trunk/tests/z120_test/z120_test12.mpr 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test12.mpr 2009-09-19 12:18:13 UTC (rev 342)
@@ -8,26 +8,26 @@
inst B;
A: instance;
concurrent;
-label e0; out ano,0 to B;
-label e1; out ano,1 to B;
-label e2; in nie,2 from B;
+out ano,0 to B;
+out ano,1 to B;
+in nie,2 from B;
endconcurrent;
concurrent;
-label e3; out micron,3 to B;
-label e4; out rad,4 to lost;
+out micron,3 to B;
+out rad,4 to lost;
endconcurrent;
in dan,5 from B;
in track,6 from B;
endinstance;
B: instance;
concurrent;
-label e5; in ano,1 from A;
-label e6; out nie,2 to A;
-label e7; in ano,0 from A;
+in ano,1 from A;
+out nie,2 to A;
+in ano,0 from A;
endconcurrent;
in micron,3 from A;
concurrent;
-label e8; out dan,5 to A;
+out dan,5 to A;
endconcurrent;
out track,6 to A;
in rad,7 from found;
Modified: trunk/tests/z120_test/z120_test12.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test12.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test12.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -6,26 +6,26 @@
inst B;
A: instance;
concurrent;
-label e0; out ano,0 to B;
-label e1; out ano,1 to B;
-label e2; in nie,2 from B;
+out ano,0 to B;
+out ano,1 to B;
+in nie,2 from B;
endconcurrent;
concurrent;
-label e3; out micron,3 to B;
-label e4; out rad,4 to lost;
+out micron,3 to B;
+out rad,4 to lost;
endconcurrent;
in dan,5 from B;
in track,6 from B;
endinstance;
B: instance;
concurrent;
-label e5; in ano,1 from A;
-label e6; out nie,2 to A;
-label e7; in ano,0 from A;
+in ano,1 from A;
+out nie,2 to A;
+in ano,0 from A;
endconcurrent;
in micron,3 from A;
concurrent;
-label e8; out dan,5 to A;
+out dan,5 to A;
endconcurrent;
out track,6 to A;
in rad,7 from found;
Modified: trunk/tests/z120_test/z120_test13.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test13.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test13.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -17,9 +17,10 @@
out SYNACK,1 to PC;
in ACK,2 from PC;
concurrent;
-label e0; out result,5 to PC before e1;
-label e2; in request_b,4 from PC;
-label e1; in request_a,3 from PC;
+out result,5 to PC before e0;
+in request_b,4 from PC;
+label e0;
+in request_a,3 from PC;
endconcurrent;
endinstance;
endmsc;
Modified: trunk/tests/z120_test/z120_test14.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test14.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test14.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -6,23 +6,23 @@
inst B;
A: instance;
concurrent;
-label e0; out ano,0 to B;
-label e1; in nie,1 from B;
+out ano,0 to B;
+in nie,1 from B;
endconcurrent;
concurrent;
-label e2; out micron,2 to B;
+out micron,2 to B;
endconcurrent;
in dan,3 from B;
in track,4 from B;
endinstance;
B: instance;
concurrent;
-label e3; out nie,1 to A;
-label e4; in ano,0 from A;
+out nie,1 to A;
+in ano,0 from A;
endconcurrent;
in micron,2 from A;
concurrent;
-label e5; out dan,3 to A;
+out dan,3 to A;
endconcurrent;
out track,4 to A;
in rad,5 from found;
Modified: trunk/tests/z120_test/z120_test15.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test15.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test15.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -6,22 +6,22 @@
inst server;
client: instance;
concurrent;
-label e0; out no,0 to server;
-label e1; in know,1 from server;
+out no,0 to server;
+in know,1 from server;
endconcurrent;
out yes,2 to lost;
concurrent;
-label e2; in tric,3 from server;
+in tric,3 from server;
endconcurrent;
in tric,4 from found;
endinstance;
server: instance;
in no,0 from client;
concurrent;
-label e3; out know,1 to client;
+out know,1 to client;
endconcurrent;
concurrent;
-label e4; out tric,3 to client;
+out tric,3 to client;
endconcurrent;
endinstance;
endmsc;
Modified: trunk/tests/z120_test/z120_test32.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test32.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test32.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -8,8 +8,9 @@
inst NAME2;
NAME1: instance;
concurrent;
-label e0; out b,0 to NAME2 before e1;
-label e1; in a,1 from NAME2;
+out b,0 to NAME2 before e0;
+label e0;
+in a,1 from NAME2;
endconcurrent;
endinstance;
NAME2: instance;
Modified: trunk/tests/z120_test/z120_test33.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test33.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test33.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -8,8 +8,9 @@
inst NAME2;
NAME1: instance;
concurrent;
-label e0; out b,0 to NAME2 before e1;
-label e1; in a,1 from NAME2;
+out b,0 to NAME2 before e0;
+label e0;
+in a,1 from NAME2;
endconcurrent;
endinstance;
NAME2: instance;
Modified: trunk/tests/z120_test/z120_test34.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test34.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test34.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -8,8 +8,9 @@
inst NAME2;
NAME1: instance;
concurrent;
-label e0; out b,0 to NAME2 before e1;
-label e1; in a,1 from NAME2;
+out b,0 to NAME2 before e0;
+label e0;
+in a,1 from NAME2;
endconcurrent;
endinstance;
NAME2: instance;
Modified: trunk/tests/z120_test/z120_test35.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test35.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test35.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -8,8 +8,9 @@
inst NAME2;
NAME1: instance;
concurrent;
-label e0; out b,0 to NAME2 before e1;
-label e1; in a,1 from NAME2;
+out b,0 to NAME2 before e0;
+label e0;
+in a,1 from NAME2;
endconcurrent;
endinstance;
NAME2: instance;
Modified: trunk/tests/z120_test/z120_test45.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test45.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test45.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -9,8 +9,8 @@
A: instance;
in A,0 from found;
concurrent;
-label e0; out B1,1 to B;
-label e1; out B,2 to lost;
+out B1,1 to B;
+out B,2 to lost;
endconcurrent;
endinstance;
B: instance;
Modified: trunk/tests/z120_test/z120_test47.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test47.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test47.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -8,8 +8,8 @@
in A,0 from found;
out jedna,1 to B;
concurrent;
-label e0; out B1,2 to B;
-label e1; out B,3 to lost;
+out B1,2 to B;
+out B,3 to lost;
endconcurrent;
endinstance;
B: instance;
Modified: trunk/tests/z120_test/z120_test51.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test51.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test51.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -10,8 +10,8 @@
in A,0 from found;
out jedna,1 to lost;
concurrent;
-label e0; out B1,2 to B;
-label e1; out B,3 to lost;
+out B1,2 to B;
+out B,3 to lost;
endconcurrent;
endinstance;
B: instance;
Modified: trunk/tests/z120_test/z120_test54.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test54.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test54.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -14,8 +14,8 @@
in A,2 from found;
out jedna,0 to B;
concurrent;
-label e0; out B,3 to lost;
-label e1; out B1,1 to B;
+out B,3 to lost;
+out B1,1 to B;
endconcurrent;
endinstance;
endmsc;
Modified: trunk/tests/z120_test/z120_test55.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test55.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test55.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -15,8 +15,8 @@
in A,0 from B;
out jedna,1 to B;
concurrent;
-label e0; out B1,2 to B;
-label e1; out B,3 to lost;
+out B1,2 to B;
+out B,3 to lost;
endconcurrent;
endinstance;
endmsc;
Modified: trunk/tests/z120_test/z120_test58.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test58.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test58.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -14,19 +14,19 @@
inst server;
client: instance;
concurrent;
-label e0; out no,0 to server;
-label e1; in know,1 from server;
+out no,0 to server;
+in know,1 from server;
endconcurrent;
out yes,2 to lost;
concurrent;
-label e2; in tric,3 from server;
+in tric,3 from server;
endconcurrent;
in tric,4 from found;
endinstance;
server: instance;
in no,0 from client;
concurrent;
-label e3; out know,1 to client;
+out know,1 to client;
endconcurrent;
out tric,3 to client;
endinstance;
Modified: trunk/tests/z120_test/z120_test59.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test59.mpr.result 2009-09-19 10:29:05 UTC (rev 341)
+++ trunk/tests/z120_test/z120_test59.mpr.result 2009-09-19 12:18:13 UTC (rev 342)
@@ -11,19 +11,19 @@
inst server;
client: instance;
concurrent;
-label e0; out no,0 to server;
-label e1; in know,1 from server;
+out no,0 to server;
+in know,1 from server;
endconcurrent;
out yes,2 to lost;
concurrent;
-label e2; in tric,3 from server;
+in tric,3 from server;
endconcurrent;
in tric,4 from found;
endinstance;
server: instance;
in no,0 from client;
concurrent;
-label e3; out know,1 to client;
+out know,1 to client;
endconcurrent;
out tric,3 to client;
endinstance;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
