Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[448] trunk
|
From: <ma...@us...> - 2009-10-28 19:27:04
|
Revision: 448
http://scstudio.svn.sourceforge.net/scstudio/?rev=448&view=rev
Author: madzin
Date: 2009-10-28 19:26:56 +0000 (Wed, 28 Oct 2009)
Log Message:
-----------
New test results and new tests for parser
Modified Paths:
--------------
trunk/src/data/Z120/Context.cpp
trunk/src/data/Z120/Context.h
trunk/src/data/Z120/Context_Impl.h
trunk/src/data/Z120/Z120.g
trunk/tests/z120_test/CMakeLists.txt
trunk/tests/z120_test/z120_test64.mpr
trunk/tests/z120_test/z120_test64.mpr.result
trunk/tests/z120_test/z120_test77.mpr
trunk/tests/z120_test/z120_test79.mpr
trunk/tests/z120_test/z120_test80.mpr
trunk/tests/z120_test/z120_test81.mpr
trunk/tests/z120_test/z120_test82.mpr
trunk/tests/z120_test/z120_test83.mpr.result
trunk/tests/z120_test/z120_time13.mpr.result
trunk/tests/z120_test/z120_time15.mpr.result
Added Paths:
-----------
trunk/tests/z120_test/z120_test66.mpr.result
trunk/tests/z120_test/z120_test70.mpr.result
trunk/tests/z120_test/z120_test77.mpr.result
trunk/tests/z120_test/z120_test78.mpr.result
trunk/tests/z120_test/z120_test79.mpr.result
trunk/tests/z120_test/z120_test80.mpr.result
trunk/tests/z120_test/z120_test81.mpr.result
trunk/tests/z120_test/z120_test82.mpr.result
trunk/tests/z120_test/z120_test84.mpr
trunk/tests/z120_test/z120_test84.mpr.result
trunk/tests/z120_test/z120_time16.mpr
trunk/tests/z120_test/z120_time16.mpr.result
trunk/tests/z120_test/z120_time17.mpr
trunk/tests/z120_test/z120_time17.mpr.result
Modified: trunk/src/data/Z120/Context.cpp
===================================================================
--- trunk/src/data/Z120/Context.cpp 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/src/data/Z120/Context.cpp 2009-10-28 19:26:56 UTC (rev 448)
@@ -76,6 +76,7 @@
context->error_inst_names.clear();
context->error_nodes_names.clear();
context->error_event_names.clear();
+ context->end_msc = false;
context->start_node = NULL;
context->end_node = std::make_pair("", context->end_node.second); //replaice context->end_node.second with NULL
@@ -281,16 +282,18 @@
context->z->print_report(RS_WARNING, stringize() << L"Warning 21: Instance in MSC (" << TOWSTRING(context->msc_name) << ") has been finished more times");
}
+ std::set<std::string> nodes_names;
+
if(context->future_top_time_relations.size() > 0)
{
- context->z->print_report(RS_WARNING, L"Warning 24: Time information to non-existed reference node: ");
-
std::map<std::string, std::set<TimeRelationRefNodePtr> >::iterator it;
std::set<TimeRelationRefNodePtr>::iterator set_it;
ReferenceNode* ref_node;
for(it = context->future_top_time_relations.begin(); it != context->future_top_time_relations.end(); it++)
{
+ nodes_names.insert(it->first);
+
for(set_it = it->second.begin(); set_it != it->second.end(); set_it++)
{
ref_node = (*set_it)->get_ref_node_a();
@@ -302,14 +305,14 @@
if(context->future_bottom_time_relations.size() > 0)
{
- context->z->print_report(RS_WARNING, L"Warning 24: Time information to non-existed reference node: ");
-
std::map<std::string, std::set<TimeRelationRefNodePtr> >::iterator it;
std::set<TimeRelationRefNodePtr>::iterator set_it;
ReferenceNode* ref_node;
for(it = context->future_bottom_time_relations.begin(); it != context->future_bottom_time_relations.end(); ++it)
{
+ nodes_names.insert(it->first);
+
for(set_it = it->second.begin(); set_it != it->second.end(); set_it++)
{
ref_node = (*set_it)->get_ref_node_a();
@@ -319,6 +322,25 @@
context->future_bottom_time_relations.clear();
}
+ if(!nodes_names.empty())
+ {
+ std::set<std::string>::iterator it;
+ std::string names;
+
+ for(it = nodes_names.begin(); it != nodes_names.end(); it++)
+ {
+ if(it != nodes_names.begin())
+ {
+ names += ", ";
+ }
+
+ names += (*it);
+ }
+
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 24: Time information to non-existed reference node: " << TOWSTRING(names));
+
+ }
+
context->error_inst_names.clear();
context->error_nodes_names.clear();
context->error_event_names.clear();
@@ -350,6 +372,11 @@
void msc_was_read_fun(struct Context* context)
{
+ if(!context->end_msc)
+ {
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 12: MSC (" << TOWSTRING(context->msc_name) << ") is not finished correctly (missing: endmsc;)" );
+ }
+
if(context->mscs.find(context->msc_name) != context->mscs.end()){
if(context->error_mscs_names.find(context->msc_name) == context->error_mscs_names.end())
{
@@ -373,10 +400,12 @@
std::set<ReferenceNodePtr>::iterator references = future_ref_it->second.begin();
for(; references != future_ref_it->second.end(); ++references)
{
- (*references)->set_msc(msc);
+ (*references)->set_msc(msc);
}
context->future_reference.erase(future_ref_it);
+
}
+
}
/*
@@ -396,8 +425,19 @@
context->origin = true;
}
+/*
+ * End of MSC was occurred
+ */
+void set_end_msc_fun(struct Context* context)
+{
+ context->end_msc = true;
+}
/*
+ * FUNCTIONS FOR BMSC
+ */
+
+/*
* Create new BMsc structure
*/
void new_bmsc_fun(struct Context* context)
@@ -763,7 +803,7 @@
}
else{
context->not_create_event = 1;
- if(context->error_inst_names.find(context->element_name) == context->error_inst_names.end())
+ if(context->error_event_names.find(name) == context->error_event_names.end())
{
context->z->print_report(RS_WARNING, stringize() << L"Warning 17: Two or more events with the same name: " << TOWSTRING(name));
context->error_event_names.insert(name);
@@ -1091,6 +1131,7 @@
if(context->not_connect == 1)
{
context->connect_name.clear();
+ context->not_connect = 0;
return ;
}
Modified: trunk/src/data/Z120/Context.h
===================================================================
--- trunk/src/data/Z120/Context.h 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/src/data/Z120/Context.h 2009-10-28 19:26:56 UTC (rev 448)
@@ -62,6 +62,8 @@
void set_origin_fun(struct Context* context);
+void set_end_msc_fun(struct Context* context);
+
//BMsc
void new_bmsc_fun(struct Context* context);
Modified: trunk/src/data/Z120/Context_Impl.h
===================================================================
--- trunk/src/data/Z120/Context_Impl.h 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/src/data/Z120/Context_Impl.h 2009-10-28 19:26:56 UTC (rev 448)
@@ -70,6 +70,8 @@
std::set<std::string> error_mscs_names; //names of mscs which were declared more times
std::set<std::string> error_event_names; //names of events which were declared more times
std::set<std::string> error_nodes_names; //names of nodes which were declared more times
+
+ bool end_msc;
/*
* BMsc
Modified: trunk/src/data/Z120/Z120.g
===================================================================
--- trunk/src/data/Z120/Z120.g 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/src/data/Z120/Z120.g 2009-10-28 19:26:56 UTC (rev 448)
@@ -260,7 +260,8 @@
{
init(context);
}
- (virtuality)? 'msc' msc_head ( ('expr' | (hmsc_statement_without_initial)* initial_node)=> hmsc | msc ) ('endmsc' end)?
+ (virtuality)? 'msc' msc_head ( ('expr' | (hmsc_statement_without_initial)* initial_node)=> hmsc | msc )
+ ('endmsc' end { set_end_msc_fun(context);})?
{
check_collections_fun(context);
msc_was_read_fun(context);
Modified: trunk/tests/z120_test/CMakeLists.txt
===================================================================
--- trunk/tests/z120_test/CMakeLists.txt 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/tests/z120_test/CMakeLists.txt 2009-10-28 19:26:56 UTC (rev 448)
@@ -104,6 +104,7 @@
ADD_Z120_TEST(z120_test81.mpr 1)
ADD_Z120_TEST(z120_test82.mpr 1)
ADD_Z120_TEST(z120_test83.mpr 1)
+ADD_Z120_TEST(z120_test84.mpr 1)
ADD_Z120_TEST(z120_time01.mpr 1)
ADD_Z120_TEST(z120_time02.mpr 1)
@@ -120,6 +121,9 @@
ADD_Z120_TEST(z120_time13.mpr 1)
ADD_Z120_TEST(z120_time14.mpr 1)
ADD_Z120_TEST(z120_time15.mpr 1)
+ADD_Z120_TEST(z120_time16.mpr 1)
+ADD_Z120_TEST(z120_time17.mpr 1)
+ADD_Z120_TEST(z120_time18.mpr 1)
# $Id$
Modified: trunk/tests/z120_test/z120_test64.mpr
===================================================================
--- trunk/tests/z120_test/z120_test64.mpr 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/tests/z120_test/z120_test64.mpr 2009-10-28 19:26:56 UTC (rev 448)
@@ -1,5 +1,8 @@
/*************************************************
Example of bMSC with coregion (used '_' sign)
+
+line 21: fom -> from
+line 25: befre -> before
*************************************************/
mscdocument Vkres1;
Modified: trunk/tests/z120_test/z120_test64.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test64.mpr.result 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/tests/z120_test/z120_test64.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -1,12 +1,12 @@
-z120_test64.mpr[18,9] Missing 'from'.
-z120_test64.mpr[18,9] Unwanted input: expected ';'.
-z120_test64.mpr[22,23] Missing ';'.
-z120_test64.mpr[22,29] Cannot match to any predicted input.
-z120_test64.mpr[24,6] Cannot match to any predicted input.
-Warning 04: Instance Server does not have finished coregion
-Warning 05: There is complete message with only one event
-Warning 20: Msc (Strnka1) has not finished 1 instance
-
+z120_test64.mpr[21,9] Missing 'from'.
+z120_test64.mpr[21,9] Unwanted input: expected ';'.
+z120_test64.mpr[25,23] Missing ';'.
+z120_test64.mpr[25,29] Cannot match to any predicted input.
+z120_test64.mpr[27,6] Cannot match to any predicted input.
+Warning 04: Instances which does not have finished coretion: Server
+Warning 05: There is complete message (request_b,4) with only one event
+Warning 05: There is complete message (result,5) with only one event
+Warning 20: MSC (Strnka1) has not finished 1 instance
OK: z120_test64 is correct, should be correct
mscdocument z120_test64;
Added: trunk/tests/z120_test/z120_test66.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test66.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test66.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,28 @@
+Warning 12: MSC (Strnka1) is not finished correctly (missing: endmsc;)
+OK: z120_test66 is correct, should be correct
+
+mscdocument z120_test66;
+msc Strnka1;
+inst client;
+inst server;
+client: instance;
+concurrent;
+out no,0 to server;
+in know,1 from server;
+endconcurrent;
+out yes,2 to lost;
+concurrent;
+in tric,3 from server;
+endconcurrent;
+in tric,4 from found;
+endinstance;
+server: instance;
+in no,0 from client;
+concurrent;
+out know,1 to client;
+endconcurrent;
+concurrent;
+out tric,3 to client;
+endconcurrent;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test70.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test70.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test70.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,28 @@
+z120_test70.mpr[22,0] Cannot match to any predicted input.
+OK: z120_test70 is correct, should be correct
+
+mscdocument z120_test70;
+msc Strnka1;
+inst PC;
+inst Server;
+PC: instance;
+out SYN,0 to Server;
+in SYNACK,1 from Server;
+out ACK,2 to Server;
+out request_a,3 to Server;
+out request_b,4 to Server;
+in result,5 from Server;
+endinstance;
+Server: instance;
+in SYN,0 from PC;
+out SYNACK,1 to PC;
+in ACK,2 from PC;
+concurrent;
+in request_a,3 from PC before e0, e1;
+label e0;
+out result,5 to PC;
+label e1;
+in request_b,4 from PC;
+endconcurrent;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test77.mpr
===================================================================
--- trunk/tests/z120_test/z120_test77.mpr 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/tests/z120_test/z120_test77.mpr 2009-10-28 19:26:56 UTC (rev 448)
@@ -1,5 +1,5 @@
/******************************************************
-Example of bMSC where two events have the same name (incomplete input message)
+Example of bMSC where three events have the same name
******************************************************/
msc Stranka1;
Added: trunk/tests/z120_test/z120_test77.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test77.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test77.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,19 @@
+Warning 17: Two or more events with the same name: e0
+OK: z120_test77 is correct, should be correct
+
+mscdocument z120_test77;
+msc Stranka1;
+inst NAME1;
+inst NAME2;
+NAME1: instance;
+concurrent;
+out b,0 to NAME2 before e0;
+label e0;
+in a,1 from NAME2;
+endconcurrent;
+endinstance;
+NAME2: instance;
+out a,1 to NAME1;
+in b,0 from NAME1;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test78.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test78.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test78.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,10 @@
+Warning 15: Two or more nodes with the same name: L0
+Warning 08: MSC (Stranka_1) has reference to nonexisted node: L1
+OK: z120_test78 is correct, should be correct
+
+mscdocument z120_test78;
+msc Stranka_1;
+initial connect L0;
+L0: connect L1;
+L1: final;
+endmsc;
Modified: trunk/tests/z120_test/z120_test79.mpr
===================================================================
--- trunk/tests/z120_test/z120_test79.mpr 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/tests/z120_test/z120_test79.mpr 2009-10-28 19:26:56 UTC (rev 448)
@@ -1,3 +1,7 @@
+/*********************************
+HMSC with three connection nodes with the same name
+*********************************/
+
mscdocument Vykres1;
msc Denied;
inst NAME2;
Added: trunk/tests/z120_test/z120_test79.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test79.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test79.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,31 @@
+Warning 15: Two or more nodes with the same name: L0
+Warning 08: MSC (Stranka_1) has reference to nonexisted node: L1
+OK: z120_test79 is correct, should be correct
+
+mscdocument z120_test79;
+msc Stranka_1;
+initial connect L0;
+L0: connect L1;
+L1: reference Denied connect L2;
+L2: final;
+endmsc;
+msc Accept;
+inst NAME;
+inst NAME1;
+NAME: instance;
+in NAME,0 from NAME1;
+endinstance;
+NAME1: instance;
+out NAME,0 to NAME;
+endinstance;
+endmsc;
+msc Denied;
+inst NAME2;
+inst NAME;
+NAME2: instance;
+out NAME,0 to NAME;
+endinstance;
+NAME: instance;
+in NAME,0 from NAME2;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test80.mpr
===================================================================
--- trunk/tests/z120_test/z120_test80.mpr 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/tests/z120_test/z120_test80.mpr 2009-10-28 19:26:56 UTC (rev 448)
@@ -1,30 +1,29 @@
+/**************************************************
+HMSC with:
+ three connection nodes with the same name.
+ three condition nodes with the same name.
+ three reference nodes with the same name.
+ condition node, reference node and connection node with the same name.
+**************************************************/
+
mscdocument Vykres1;
-msc Denied;
-inst NAME2;
-inst NAME;
-NAME2: instance;
-out NAME,0 to NAME;
-endinstance;
-NAME: instance;
-in NAME,0 from NAME2;
-endinstance;
-endmsc;
msc Stranka_1;
-initial connect L0, L1;
+initial connect L0, L1, L2, L3, L4;
L0: connect L2;
L0: connect L4;
L0: connect L3;
+
+L1: condition true connect L2;
+L1: condition false connect L3;
+L1: condition boolean connect L4;
+
L2: reference Denied connect L4;
+L2: reference True connect L4;
+L2: reference False connect L4;
+
+L3: condition mark connect L4;
L3: reference Accept connect L4;
+L3: connect L4;
+
L4: final;
endmsc;
-msc Accept;
-inst NAME;
-inst NAME1;
-NAME: instance;
-in NAME,0 from NAME1;
-endinstance;
-NAME1: instance;
-out NAME,0 to NAME;
-endinstance;
-endmsc;
Added: trunk/tests/z120_test/z120_test80.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test80.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test80.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,18 @@
+Warning 15: Two or more nodes with the same name: L0
+Warning 15: Two or more nodes with the same name: L1
+Warning 15: Two or more nodes with the same name: L2
+Warning 15: Two or more nodes with the same name: L3
+Warning 09: Reference to nonexisted MSC: Denied
+OK: z120_test80 is correct, should be correct
+
+mscdocument z120_test80;
+msc Stranka_1;
+initial connect L0, L1, L2, L3, L4;
+L0: connect L2;
+L1: condition true connect L2;
+L2: reference Denied connect L4;
+L3: condition mark connect L4;
+L4: final;
+endmsc;
+msc Denied;
+endmsc;
Modified: trunk/tests/z120_test/z120_test81.mpr
===================================================================
--- trunk/tests/z120_test/z120_test81.mpr 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/tests/z120_test/z120_test81.mpr 2009-10-28 19:26:56 UTC (rev 448)
@@ -1,14 +1,8 @@
+/***************************************************
+HMSC with three condition nodes with the same name
+****************************************************/
+
mscdocument Vykres1;
-msc Denied;
-inst NAME2;
-inst NAME;
-NAME2: instance;
-out NAME,0 to NAME;
-endinstance;
-NAME: instance;
-in NAME,0 from NAME2;
-endinstance;
-endmsc;
msc Stranka_1;
initial connect L0, L1;
L0: condition true connect L2;
@@ -18,13 +12,3 @@
L3: reference Accept connect L4;
L4: final;
endmsc;
-msc Accept;
-inst NAME;
-inst NAME1;
-NAME: instance;
-in NAME,0 from NAME1;
-endinstance;
-NAME1: instance;
-out NAME,0 to NAME;
-endinstance;
-endmsc;
Added: trunk/tests/z120_test/z120_test81.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test81.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test81.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,14 @@
+Warning 15: Two or more nodes with the same name: L0
+Warning 08: MSC (Stranka_1) has reference to nonexisted node: L1
+Warning 09: Reference to nonexisted MSC: Accept, Denied
+OK: z120_test81 is correct, should be correct
+
+mscdocument z120_test81;
+msc Stranka_1;
+initial connect L0;
+L0: condition true connect L1;
+L1: reference Denied connect L2;
+L2: final;
+endmsc;
+msc Denied;
+endmsc;
Modified: trunk/tests/z120_test/z120_test82.mpr
===================================================================
--- trunk/tests/z120_test/z120_test82.mpr 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/tests/z120_test/z120_test82.mpr 2009-10-28 19:26:56 UTC (rev 448)
@@ -1,14 +1,8 @@
+/*******************************************
+HMSC with three reference nodes with the same name.
+*******************************************/
+
mscdocument Vykres1;
-msc Denied;
-inst NAME2;
-inst NAME;
-NAME2: instance;
-out NAME,0 to NAME;
-endinstance;
-NAME: instance;
-in NAME,0 from NAME2;
-endinstance;
-endmsc;
msc Stranka_1;
initial connect L0, L1;
L0: connect L2;
@@ -19,13 +13,3 @@
L3: reference Accept connect L4;
L4: final;
endmsc;
-msc Accept;
-inst NAME;
-inst NAME1;
-NAME: instance;
-in NAME,0 from NAME1;
-endinstance;
-NAME1: instance;
-out NAME,0 to NAME;
-endinstance;
-endmsc;
Added: trunk/tests/z120_test/z120_test82.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test82.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test82.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,17 @@
+Warning 15: Two or more nodes with the same name: L2
+Warning 09: Reference to nonexisted MSC: Accept, Denied
+OK: z120_test82 is correct, should be correct
+
+mscdocument z120_test82;
+msc Stranka_1;
+initial connect L0, L1;
+L0: connect L2;
+L1: connect L3;
+L2: reference Denied connect L4;
+L3: reference Accept connect L4;
+L4: final;
+endmsc;
+msc Denied;
+endmsc;
+msc Accept;
+endmsc;
Modified: trunk/tests/z120_test/z120_test83.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test83.mpr.result 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/tests/z120_test/z120_test83.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -1,5 +1,5 @@
z120_test83.mpr[10,4] Cannot match to any predicted input.
-Warning 08: Msc (Stranka1) has reference to nonexisted node: L1, L5
+Warning 08: MSC (Stranka1) has reference to nonexisted node: L1, L5
Warning 09: Reference to nonexisted MSC: NAME1
OK: z120_test83 is correct, should be correct
Added: trunk/tests/z120_test/z120_test84.mpr
===================================================================
--- trunk/tests/z120_test/z120_test84.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test84.mpr 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,29 @@
+/******************************************************
+Example of bMSC where two events have the same name (incomplete input message)
+
+parser takes message label e0; in a,0 from NAME2; and wait for second part of the message
+ignores label e0; in a,0 from NAME2; due to the same name of the event
+ignores label e0; in a,0 from found before e1; due to the same name of the event
+
+ignores label e0; out a,0 to NAME1; due to the same name of the event
+at the end parser recognize that the message label e0; in a,0 from NAME2; has only one part
+prints warning and modifies the message to label e0; in a,0 from found;
+******************************************************/
+
+msc Stranka1;
+inst NAME1;
+inst NAME2;
+NAME1: instance;
+concurrent;
+label e1; out b,1 to NAME2 before e0;
+label e0; in a,0 from NAME2;
+label e0; in a,0 from found;
+label e0; in a,0 from found before e1;
+endconcurrent;
+endinstance;
+NAME2: instance;
+label e0; out a,0 to NAME1;
+in b,1 from NAME1;
+endinstance;
+endmsc;
+
Added: trunk/tests/z120_test/z120_test84.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test84.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test84.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,19 @@
+Warning 17: Two or more events with the same name: e0
+Warning 05: There is complete message (a,0) with only one event
+OK: z120_test84 is correct, should be correct
+
+mscdocument z120_test84;
+msc Stranka1;
+inst NAME1;
+inst NAME2;
+NAME1: instance;
+concurrent;
+out b,0 to NAME2 before e0;
+label e0;
+in a,1 from found;
+endconcurrent;
+endinstance;
+NAME2: instance;
+in b,0 from NAME1;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_time13.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time13.mpr.result 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/tests/z120_test/z120_time13.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -1,5 +1,4 @@
-Warning 24: Some time information points to non-existed reference node
-
+Warning 24: Time information to non-existed reference node: L2
OK: z120_time13 is correct, should be correct
mscdocument z120_time13;
Modified: trunk/tests/z120_test/z120_time15.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time15.mpr.result 2009-10-27 15:29:36 UTC (rev 447)
+++ trunk/tests/z120_test/z120_time15.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -1,5 +1,4 @@
-Warning 24: Some time information points to non-existed reference node
-
+Warning 24: Time information to non-existed reference node: L2
OK: z120_time15 is correct, should be correct
mscdocument z120_time15;
Added: trunk/tests/z120_test/z120_time16.mpr
===================================================================
--- trunk/tests/z120_test/z120_time16.mpr (rev 0)
+++ trunk/tests/z120_test/z120_time16.mpr 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,21 @@
+/* Incorrect time constraint (top bottom) between reference node and final node (forbidden).
+ */
+mscdocument Vykres1;
+msc Stranka_1;
+initial connect L0, L1;
+L0: reference A top bottom L2 [0,inf);
+ connect L2;
+L1: reference B top bottom L2 [0,4);
+ connect L2;
+L2: final;
+endmsc;
+msc A;
+inst NAME;
+NAME: instance;
+endinstance;
+endmsc;
+msc B;
+inst NAME;
+NAME: instance;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_time16.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time16.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_time16.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,20 @@
+Warning 24: Time information to non-existed reference node: L2
+OK: z120_time16 is correct, should be correct
+
+mscdocument z120_time16;
+msc Stranka_1;
+initial connect L0, L1;
+L0: reference A connect L2;
+L1: reference B connect L2;
+L2: final;
+endmsc;
+msc A;
+inst NAME;
+NAME: instance;
+endinstance;
+endmsc;
+msc B;
+inst NAME;
+NAME: instance;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_time17.mpr
===================================================================
--- trunk/tests/z120_test/z120_time17.mpr (rev 0)
+++ trunk/tests/z120_test/z120_time17.mpr 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,21 @@
+/* Incorrect time constraint (bottom top) between reference node and final node (forbidden)
+ */
+mscdocument Vykres1;
+msc Stranka_1;
+initial connect L0, L1;
+L0: reference A bottom top L2 [0,inf);
+ connect L2;
+L1: reference B bottom top L2 [0,4);
+ connect L2;
+L2: final;
+endmsc;
+msc A;
+inst NAME;
+NAME: instance;
+endinstance;
+endmsc;
+msc B;
+inst NAME;
+NAME: instance;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_time17.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time17.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_time17.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
@@ -0,0 +1,20 @@
+Warning 24: Time information to non-existed reference node: L2
+OK: z120_time17 is correct, should be correct
+
+mscdocument z120_time17;
+msc Stranka_1;
+initial connect L0, L1;
+L0: reference A connect L2;
+L1: reference B connect L2;
+L2: final;
+endmsc;
+msc A;
+inst NAME;
+NAME: instance;
+endinstance;
+endmsc;
+msc B;
+inst NAME;
+NAME: instance;
+endinstance;
+endmsc;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
