Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[449] trunk
|
From: <ma...@us...> - 2009-11-03 00:56:38
|
Revision: 449
http://scstudio.svn.sourceforge.net/scstudio/?rev=449&view=rev
Author: madzin
Date: 2009-11-03 00:56:27 +0000 (Tue, 03 Nov 2009)
Log Message:
-----------
Fix of error messages.
Modified Paths:
--------------
trunk/src/data/Z120/Context.cpp
trunk/tests/z120_test/CMakeLists.txt
trunk/tests/z120_test/z120_test01.mpr.result
trunk/tests/z120_test/z120_test02.mpr.result
trunk/tests/z120_test/z120_test04.mpr.result
trunk/tests/z120_test/z120_test09.mpr.result
trunk/tests/z120_test/z120_test18.mpr.result
trunk/tests/z120_test/z120_test21.mpr.result
trunk/tests/z120_test/z120_test24.mpr.result
trunk/tests/z120_test/z120_test25.mpr.result
trunk/tests/z120_test/z120_test27.mpr.result
trunk/tests/z120_test/z120_test28.mpr.result
trunk/tests/z120_test/z120_test29.mpr.result
trunk/tests/z120_test/z120_test30.mpr.result
trunk/tests/z120_test/z120_test31.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_test37.mpr.result
trunk/tests/z120_test/z120_test38.mpr.result
trunk/tests/z120_test/z120_test40.mpr.result
trunk/tests/z120_test/z120_test41.mpr.result
trunk/tests/z120_test/z120_test45.mpr.result
trunk/tests/z120_test/z120_test49.mpr.result
trunk/tests/z120_test/z120_test50.mpr.result
trunk/tests/z120_test/z120_test51.mpr.result
trunk/tests/z120_test/z120_test58.mpr.result
trunk/tests/z120_test/z120_test59.mpr.result
trunk/tests/z120_test/z120_test61.mpr.result
trunk/tests/z120_test/z120_test62.mpr.result
trunk/tests/z120_test/z120_test63.mpr.result
trunk/tests/z120_test/z120_test64.mpr.result
trunk/tests/z120_test/z120_test65.mpr.result
trunk/tests/z120_test/z120_test66.mpr.result
trunk/tests/z120_test/z120_test67.mpr.result
trunk/tests/z120_test/z120_test68.mpr.result
trunk/tests/z120_test/z120_test69.mpr.result
trunk/tests/z120_test/z120_test72.mpr.result
trunk/tests/z120_test/z120_test74.mpr.result
trunk/tests/z120_test/z120_test75.mpr.result
trunk/tests/z120_test/z120_test76.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_test83.mpr.result
trunk/tests/z120_test/z120_test84.mpr.result
trunk/tests/z120_test/z120_time11.mpr.result
trunk/tests/z120_test/z120_time12.mpr.result
trunk/tests/z120_test/z120_time13.mpr.result
trunk/tests/z120_test/z120_time15.mpr.result
trunk/tests/z120_test/z120_time16.mpr.result
trunk/tests/z120_test/z120_time17.mpr.result
Added Paths:
-----------
trunk/tests/z120_test/z120_test85.mpr
trunk/tests/z120_test/z120_test85.mpr.result
trunk/tests/z120_test/z120_test86.mpr
trunk/tests/z120_test/z120_time18.mpr
trunk/tests/z120_test/z120_time18.mpr.result
trunk/tests/z120_test/z120_time19.mpr
trunk/tests/z120_test/z120_time19.mpr.result
Modified: trunk/src/data/Z120/Context.cpp
===================================================================
--- trunk/src/data/Z120/Context.cpp 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/src/data/Z120/Context.cpp 2009-11-03 00:56:27 UTC (rev 449)
@@ -123,12 +123,12 @@
}
names += *it;
}
- context->z->print_report(RS_WARNING, stringize() << L"Warning 02: There are more unreferenced MSC: " << TOWSTRING(names));
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 02: Unreferenced MSC: " << TOWSTRING(names));
}
if(context->nonpointed.size() < 1 && context->mscs.size() > 0)
{
- context->z->print_report(RS_ERROR, L"Error 03: There is infinite recursion among MSCs");
+ context->z->print_report(RS_ERROR, L"Error 03: Infinite recursion among MSCs");
}
s_Msc** result = NULL;
@@ -209,7 +209,7 @@
}
names += *it;
}
- context->z->print_report(RS_WARNING, stringize() << "Warning 04: Instances which does not have finished coretion: " << TOWSTRING(names));
+ context->z->print_report(RS_WARNING, stringize() << "Warning 04: Instances with unfinished coregion: " << TOWSTRING(names));
context->coregion_area_opened.clear();
}
@@ -218,7 +218,7 @@
for(it = context->messages.begin(); it != context->messages.end(); ++it)
{
- context->z->print_report(RS_WARNING, stringize() << L"Warning 05: There is complete message (" << TOWSTRING(it->first) << ") with only one event");
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 05: Complete message (" << TOWSTRING(it->first) << ") with only one event");
}
IncompleteMessagePtr message;
@@ -239,11 +239,11 @@
}
if(!context->future_events.empty()){
- context->z->print_report(RS_WARNING, L"Warning 06: There is dependency on nonexisted event\n");
+ context->z->print_report(RS_WARNING, L"Warning 06: Dependency on nonexisting event\n");
}
if(!context->order_events.empty()){
- context->z->print_report(RS_WARNING, L"Warning 07: There is reference to nonexisted event\n");
+ context->z->print_report(RS_WARNING, L"Warning 07: Reference to nonexisting event\n");
}
if(!context->future_connections.empty()){
@@ -259,7 +259,7 @@
names += it->first;
}
- context->z->print_report(RS_WARNING, stringize() << L"Warning 08: MSC (" << TOWSTRING(context->msc_name) << ") has reference to nonexisted node: " << TOWSTRING(names));
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 08: MSC (" << TOWSTRING(context->msc_name) << ") has reference to nonexisting node: " << TOWSTRING(names));
context->future_connections.clear();
@@ -269,17 +269,17 @@
{
if(context->open_instance == 1)
{
- context->z->print_report(RS_WARNING, stringize() << "Warning 20: MSC (" << TOWSTRING(context->msc_name) << ") has not finished " << context->open_instance << " instance");
+ context->z->print_report(RS_WARNING, stringize() << "Warning 20: MSC (" << TOWSTRING(context->msc_name) << ") has unterminated " << context->open_instance << " instance");
}
else
{
- context->z->print_report(RS_WARNING, stringize() << "Warning 20: MSC " << TOWSTRING(context->msc_name) << " has not finished " << context->open_instance << " instances");
+ context->z->print_report(RS_WARNING, stringize() << "Warning 20: MSC (" << TOWSTRING(context->msc_name) << ") has unterminated " << context->open_instance << " instance");
}
}
if(context->open_instance < 0)
{
- context->z->print_report(RS_WARNING, stringize() << L"Warning 21: Instance in MSC (" << TOWSTRING(context->msc_name) << ") has been finished more times");
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 21: Instance in MSC (" << TOWSTRING(context->msc_name) << ") was terminated multiple times");
}
std::set<std::string> nodes_names;
@@ -337,7 +337,7 @@
names += (*it);
}
- context->z->print_report(RS_WARNING, stringize() << L"Warning 24: Time information to non-existed reference node: " << TOWSTRING(names));
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 24: Time information to nonexisting reference node: " << TOWSTRING(names));
}
@@ -366,7 +366,7 @@
(*ref_it)->set_msc(bmsc);
}
}
- context->z->print_report(RS_WARNING, stringize() << L"Warning 09: Reference to nonexisted MSC: " << TOWSTRING(names));
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 09: Reference to nonexisting MSC: " << TOWSTRING(names));
}
}
@@ -374,13 +374,13 @@
{
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;)" );
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 12: Incorrectly terminated MSC (" << TOWSTRING(context->msc_name) << "); 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())
{
- context->z->print_report(RS_WARNING, stringize() << "Warning 18: Two or more MSCs have the same name: " << TOWSTRING(context->msc_name) );
+ context->z->print_report(RS_WARNING, stringize() << "Warning 18: Multiple MSCs have the same name: " << TOWSTRING(context->msc_name) );
context->error_mscs_names.insert(context->msc_name);
}
}
@@ -567,7 +567,7 @@
{
if(context->error_inst_names.find(context->element_name) == context->error_inst_names.end())
{
- context->z->print_report(RS_WARNING, stringize() << L"Warning 16: Two or more instances with the same name: " << TOWSTRING(context->element_name));
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 16: Multiple instances with the same name: " << TOWSTRING(context->element_name));
context->error_inst_names.insert(context->element_name);
}
}
@@ -598,8 +598,7 @@
}
else
{
- context->z->print_report(RS_WARNING, stringize() << "Warning 10: Instance (" << TOWSTRING(context->element_name) << ") has overlapped coregions");
-
+ context->z->print_report(RS_WARNING, stringize() << "Warning 10: Instance (" << TOWSTRING(context->element_name) << ") has overlapping coregions");
}
}
@@ -617,7 +616,7 @@
}
else
{
- context->z->print_report(RS_WARNING, stringize() << "Warning 11: Instance (" << TOWSTRING(context->element_name) << ") does not have open any coregion\n"); //check
+ context->z->print_report(RS_WARNING, stringize() << "Warning 11: Instance (" << TOWSTRING(context->element_name) << ") does not have any open coregion\n");
}
}
@@ -805,7 +804,7 @@
context->not_create_event = 1;
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->z->print_report(RS_WARNING, stringize() << L"Warning 17: Multiple events with the same name: " << TOWSTRING(name));
context->error_event_names.insert(name);
}
}
@@ -819,7 +818,7 @@
void missing_message_label_fun(struct Context* context)
{
context->no_message_label = 1;
- context->z->print_report(RS_WARNING, stringize() << L"Warning 19: There is message without label on the instance (" << TOWSTRING(context->element_name) << ")");
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 19: Message without label on the instance (" << TOWSTRING(context->element_name) << ")");
}
void end_instance_fun(struct Context* context){
@@ -897,25 +896,25 @@
void set_data_parameter_decl(struct Context* context)
{
if(!context->data_parameter_decl) context->data_parameter_decl = true;
- else context->z->print_report(RS_WARNING, L"Warning 26: data parameters were declared multiple times");
+ else context->z->print_report(RS_WARNING, L"Warning 26: Data parameters were declared multiple times");
}
void set_instance_parameter_decl(struct Context* context)
{
if(!context->instance_parameter_decl) context->instance_parameter_decl = true;
- else context->z->print_report(RS_WARNING, L"Warning 27: instance parameters were declared multiple times");
+ else context->z->print_report(RS_WARNING, L"Warning 27: Instance parameters were declared multiple times");
}
void set_message_parameter_decl(struct Context* context)
{
if(!context->message_parameter_decl) context->message_parameter_decl = true;
- else context->z->print_report(RS_WARNING, L"Warning 28: message parameters were declared multiple times");
+ else context->z->print_report(RS_WARNING, L"Warning 28: Message parameters were declared multiple times");
}
void set_timer_parameter_decl(struct Context* context)
{
if(!context->timer_parameter_decl) context->timer_parameter_decl = true;
- else context->z->print_report(RS_WARNING, L"Warning 29: timer parameters were declared multiple times");
+ else context->z->print_report(RS_WARNING, L"Warning 29: Timer parameters were declared multiple times");
}
@@ -1064,7 +1063,7 @@
{
if(context->error_nodes_names.find(context->element_name) == context->error_nodes_names.end())
{
- context->z->print_report(RS_WARNING, stringize() << L"Warning 15: Two or more nodes with the same name: " << TOWSTRING(context->element_name));
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 15: Multiple nodes with the same name: " << TOWSTRING(context->element_name));
context->error_nodes_names.insert(context->element_name);
}
@@ -1091,7 +1090,7 @@
{
if(context->error_nodes_names.find(context->element_name) == context->error_nodes_names.end())
{
- context->z->print_report(RS_WARNING, stringize() << L"Warning 15: Two or more nodes with the same name: " << TOWSTRING(context->element_name));
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 15: Multiple nodes with the same name: " << TOWSTRING(context->element_name));
context->error_nodes_names.insert(context->element_name);
}
@@ -1118,7 +1117,7 @@
{
if(context->error_nodes_names.find(context->element_name) == context->error_nodes_names.end())
{
- context->z->print_report(RS_WARNING, stringize() << L"Warning 15: Two or more nodes with the same name: " << TOWSTRING(context->element_name));
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 15: Multiple nodes with the same name: " << TOWSTRING(context->element_name));
context->error_nodes_names.insert(context->element_name);
}
Modified: trunk/tests/z120_test/CMakeLists.txt
===================================================================
--- trunk/tests/z120_test/CMakeLists.txt 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/CMakeLists.txt 2009-11-03 00:56:27 UTC (rev 449)
@@ -105,6 +105,8 @@
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_test85.mpr 1)
+ADD_Z120_TEST(z120_test86.mpr 1)
ADD_Z120_TEST(z120_time01.mpr 1)
ADD_Z120_TEST(z120_time02.mpr 1)
@@ -124,6 +126,7 @@
ADD_Z120_TEST(z120_time16.mpr 1)
ADD_Z120_TEST(z120_time17.mpr 1)
ADD_Z120_TEST(z120_time18.mpr 1)
+ADD_Z120_TEST(z120_time19.mpr 1)
# $Id$
Modified: trunk/tests/z120_test/z120_test01.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test01.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test01.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 20: MSC (z120_test01) has not finished 1 instance
+Warning 20: MSC (z120_test01) has unterminated 1 instance
OK: z120_test01 is correct, should be correct
mscdocument z120_test01;
Modified: trunk/tests/z120_test/z120_test02.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test02.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test02.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 09: Reference to nonexisted MSC: ACTION1, ACTION2, ACTION3A, ACTION3B
+Warning 09: Reference to nonexisting MSC: ACTION1, ACTION2, ACTION3A, ACTION3B
OK: z120_test02 is correct, should be correct
mscdocument z120_test02;
Modified: trunk/tests/z120_test/z120_test04.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test04.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test04.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 09: Reference to nonexisted MSC: NAME, NAME1
+Warning 09: Reference to nonexisting MSC: NAME, NAME1
OK: z120_test04 is correct, should be correct
mscdocument z120_test04;
Modified: trunk/tests/z120_test/z120_test09.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test09.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test09.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 16: Two or more instances with the same name: NAME
+Warning 16: Multiple instances with the same name: NAME
OK: z120_test09 is correct, should be correct
mscdocument z120_test09;
Modified: trunk/tests/z120_test/z120_test18.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test18.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test18.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 02: There are more unreferenced MSC: Strnka1, bmsc3
+Warning 02: Unreferenced MSC: Strnka1, bmsc3
OK: z120_test18 is correct, should be correct
mscdocument z120_test18;
Modified: trunk/tests/z120_test/z120_test21.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test21.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test21.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 02: There are more unreferenced MSC: Strnka1, bmsc3
+Warning 02: Unreferenced MSC: Strnka1, bmsc3
OK: z120_test21 is correct, should be correct
mscdocument z120_test21;
Modified: trunk/tests/z120_test/z120_test24.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test24.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test24.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 16: Two or more instances with the same name: NAME
+Warning 16: Multiple instances with the same name: NAME
OK: z120_test24 is correct, should be correct
mscdocument z120_test24;
Modified: trunk/tests/z120_test/z120_test25.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test25.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test25.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 16: Two or more instances with the same name: NAME
-Warning 18: Two or more MSCs have the same name: Stranka_1
+Warning 16: Multiple instances with the same name: NAME
+Warning 18: Multiple MSCs have the same name: Stranka_1
OK: z120_test25 is correct, should be correct
mscdocument z120_test25;
Modified: trunk/tests/z120_test/z120_test27.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test27.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test27.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 16: Two or more instances with the same name: NAME
+Warning 16: Multiple instances with the same name: NAME
OK: z120_test27 is correct, should be correct
mscdocument z120_test27;
Modified: trunk/tests/z120_test/z120_test28.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test28.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test28.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 15: Two or more nodes with the same name: L1
-Warning 09: Reference to nonexisted MSC: NAME, NAME1
+Warning 15: Multiple nodes with the same name: L1
+Warning 09: Reference to nonexisting MSC: NAME, NAME1
OK: z120_test28 is correct, should be correct
mscdocument z120_test28;
Modified: trunk/tests/z120_test/z120_test29.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test29.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test29.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 15: Two or more nodes with the same name: L1
-Warning 09: Reference to nonexisted MSC: NAME, NAME1
+Warning 15: Multiple nodes with the same name: L1
+Warning 09: Reference to nonexisting MSC: NAME, NAME1
OK: z120_test29 is correct, should be correct
mscdocument z120_test29;
Modified: trunk/tests/z120_test/z120_test30.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test30.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test30.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 15: Two or more nodes with the same name: L1
-Warning 09: Reference to nonexisted MSC: NAME, NAME1
+Warning 15: Multiple nodes with the same name: L1
+Warning 09: Reference to nonexisting MSC: NAME, NAME1
OK: z120_test30 is correct, should be correct
mscdocument z120_test30;
Modified: trunk/tests/z120_test/z120_test31.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test31.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test31.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 09: Reference to nonexisted MSC: bmsc1
-Error 03: There is infinite recursion among MSCs
+Warning 09: Reference to nonexisting MSC: bmsc1
+Error 03: Infinite recursion among MSCs
OK: z120_test31 is correct, should be correct
mscdocument z120_test31;
Modified: trunk/tests/z120_test/z120_test32.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test32.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test32.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 17: Two or more events with the same name: e1
+Warning 17: Multiple events with the same name: e1
OK: z120_test32 is correct, should be correct
mscdocument z120_test32;
Modified: trunk/tests/z120_test/z120_test33.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test33.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test33.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 17: Two or more events with the same name: e0
+Warning 17: Multiple events with the same name: e0
OK: z120_test33 is correct, should be correct
mscdocument z120_test33;
Modified: trunk/tests/z120_test/z120_test34.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test34.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test34.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 17: Two or more events with the same name: e1
+Warning 17: Multiple events with the same name: e1
OK: z120_test34 is correct, should be correct
mscdocument z120_test34;
Modified: trunk/tests/z120_test/z120_test35.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test35.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test35.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 17: Two or more events with the same name: e0
+Warning 17: Multiple events with the same name: e0
OK: z120_test35 is correct, should be correct
mscdocument z120_test35;
Modified: trunk/tests/z120_test/z120_test37.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test37.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test37.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 19: There is message without label on the instance (ONE)
-Warning 19: There is message without label on the instance (TWO)
+Warning 19: Message without label on the instance (ONE)
+Warning 19: Message without label on the instance (TWO)
OK: z120_test37 is correct, should be correct
mscdocument z120_test37;
Modified: trunk/tests/z120_test/z120_test38.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test38.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test38.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 18: Two or more MSCs have the same name: Two
-Warning 02: There are more unreferenced MSC: Stranka_1, Trick, Two
+Warning 18: Multiple MSCs have the same name: Two
+Warning 02: Unreferenced MSC: Stranka_1, Trick, Two
OK: z120_test38 is correct, should be correct
mscdocument z120_test38;
Modified: trunk/tests/z120_test/z120_test40.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test40.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test40.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 18: Two or more MSCs have the same name: Stranka_1
-Warning 09: Reference to nonexisted MSC: Trick
+Warning 18: Multiple MSCs have the same name: Stranka_1
+Warning 09: Reference to nonexisting MSC: Trick
OK: z120_test40 is correct, should be correct
mscdocument z120_test40;
Modified: trunk/tests/z120_test/z120_test41.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test41.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test41.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 19: There is message without label on the instance (ONE)
-Warning 19: There is message without label on the instance (TWO)
+Warning 19: Message without label on the instance (ONE)
+Warning 19: Message without label on the instance (TWO)
OK: z120_test41 is correct, should be correct
mscdocument z120_test41;
Modified: trunk/tests/z120_test/z120_test45.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test45.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test45.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 05: There is complete message (jedna,2) with only one event
+Warning 05: Complete message (jedna,2) with only one event
OK: z120_test45 is correct, should be correct
mscdocument z120_test45;
Modified: trunk/tests/z120_test/z120_test49.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test49.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test49.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 08: MSC (Stranka1) has reference to nonexisted node: L3
-Warning 09: Reference to nonexisted MSC: NAME, NAME1
+Warning 08: MSC (Stranka1) has reference to nonexisting node: L3
+Warning 09: Reference to nonexisting MSC: NAME, NAME1
OK: z120_test49 is correct, should be correct
mscdocument z120_test49;
Modified: trunk/tests/z120_test/z120_test50.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test50.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test50.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,6 +1,6 @@
z120_test50.mpr[10,4] Cannot match to any predicted input.
-Warning 08: MSC (Stranka1) has reference to nonexisted node: L1
-Warning 09: Reference to nonexisted MSC: NAME1
+Warning 08: MSC (Stranka1) has reference to nonexisting node: L1
+Warning 09: Reference to nonexisting MSC: NAME1
OK: z120_test50 is correct, should be correct
mscdocument z120_test50;
Modified: trunk/tests/z120_test/z120_test51.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test51.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test51.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 05: There is complete message (jedna,2) with only one event
+Warning 05: Complete message (jedna,2) with only one event
OK: z120_test51 is correct, should be correct
mscdocument z120_test51;
Modified: trunk/tests/z120_test/z120_test58.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test58.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test58.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,6 +1,6 @@
z120_test58.mpr[16,9] Missing ';'.
z120_test58.mpr[16,9] Unwanted input: expected ';'.
-Warning 11: Instance (server) does not have open any coregion
+Warning 11: Instance (server) does not have any open coregion
OK: z120_test58 is correct, should be correct
Modified: trunk/tests/z120_test/z120_test59.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test59.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test59.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
z120_test59.mpr[28,0] Unwanted input: expected ';'.
-Warning 11: Instance (server) does not have open any coregion
+Warning 11: Instance (server) does not have any open coregion
OK: z120_test59 is correct, should be correct
Modified: trunk/tests/z120_test/z120_test61.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test61.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test61.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,7 +1,7 @@
z120_test61.mpr[10,0] Missing ';'.
z120_test61.mpr[12,0] Missing ';'.
-Warning 05: There is complete message (tric,3) with only one event
-Warning 05: There is complete message (tric3) with only one event
+Warning 05: Complete message (tric,3) with only one event
+Warning 05: Complete message (tric3) with only one event
OK: z120_test61 is correct, should be correct
mscdocument z120_test61;
Modified: trunk/tests/z120_test/z120_test62.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test62.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test62.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
z120_test62.mpr[10,5] Missing elements.
-Warning 20: MSC (test01) has not finished 1 instance
+Warning 20: MSC (test01) has unterminated 1 instance
OK: z120_test62 is correct, should be correct
mscdocument z120_test62;
Modified: trunk/tests/z120_test/z120_test63.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test63.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test63.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
z120_test63.mpr[4,5] Cannot match to any predicted input.
-Warning 09: Reference to nonexisted MSC: Trick
+Warning 09: Reference to nonexisting MSC: Trick
OK: z120_test63 is correct, should be correct
mscdocument z120_test63;
Modified: trunk/tests/z120_test/z120_test64.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test64.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test64.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -3,10 +3,10 @@
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
+Warning 04: Instances with unfinished coregion: Server
+Warning 05: Complete message (request_b,4) with only one event
+Warning 05: Complete message (result,5) with only one event
+Warning 20: MSC (Strnka1) has unterminated 1 instance
OK: z120_test64 is correct, should be correct
mscdocument z120_test64;
Modified: trunk/tests/z120_test/z120_test65.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test65.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test65.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,6 +1,6 @@
z120_test65.mpr[13,7] Cannot match to any predicted input.
-Warning 16: Two or more instances with the same name: NAME
-Warning 02: There are more unreferenced MSC: One, Stranka_1, Two
+Warning 16: Multiple instances with the same name: NAME
+Warning 02: Unreferenced MSC: One, Stranka_1, Two
OK: z120_test65 is correct, should be correct
mscdocument z120_test65;
Modified: trunk/tests/z120_test/z120_test66.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test66.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test66.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 12: MSC (Strnka1) is not finished correctly (missing: endmsc;)
+Warning 12: Incorrectly terminated MSC (Strnka1); missing 'endmsc;'
OK: z120_test66 is correct, should be correct
mscdocument z120_test66;
Modified: trunk/tests/z120_test/z120_test67.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test67.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test67.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 20: MSC bmsc1 has not finished 2 instances
+Warning 20: MSC (bmsc1) has unterminated 2 instance
OK: z120_test67 is correct, should be correct
mscdocument z120_test67;
Modified: trunk/tests/z120_test/z120_test68.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test68.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test68.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 21: Instance in MSC (Strnka1) has been finished more times
+Warning 21: Instance in MSC (Strnka1) was terminated multiple times
OK: z120_test68 is correct, should be correct
mscdocument z120_test68;
Modified: trunk/tests/z120_test/z120_test69.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test69.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test69.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 06: There is dependency on nonexisted event
+Warning 06: Dependency on nonexisting event
OK: z120_test69 is correct, should be correct
Modified: trunk/tests/z120_test/z120_test72.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test72.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test72.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 10: Instance (Server) has overlapped coregions
+Warning 10: Instance (Server) has overlapping coregions
OK: z120_test72 is correct, should be correct
mscdocument z120_test72;
Modified: trunk/tests/z120_test/z120_test74.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test74.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test74.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 04: Instances which does not have finished coretion: No, Yes
+Warning 04: Instances with unfinished coregion: No, Yes
OK: z120_test74 is correct, should be correct
mscdocument z120_test74;
Modified: trunk/tests/z120_test/z120_test75.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test75.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test75.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 16: Two or more instances with the same name: NAME
+Warning 16: Multiple instances with the same name: NAME
OK: z120_test75 is correct, should be correct
mscdocument z120_test75;
Modified: trunk/tests/z120_test/z120_test76.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test76.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test76.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 18: Two or more MSCs have the same name: Two
-Warning 02: There are more unreferenced MSC: Stranka_1, Trick, Two
+Warning 18: Multiple MSCs have the same name: Two
+Warning 02: Unreferenced MSC: Stranka_1, Trick, Two
OK: z120_test76 is correct, should be correct
mscdocument z120_test76;
Modified: trunk/tests/z120_test/z120_test77.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test77.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test77.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 17: Two or more events with the same name: e0
+Warning 17: Multiple events with the same name: e0
OK: z120_test77 is correct, should be correct
mscdocument z120_test77;
Modified: trunk/tests/z120_test/z120_test78.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test78.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test78.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 15: Two or more nodes with the same name: L0
-Warning 08: MSC (Stranka_1) has reference to nonexisted node: L1
+Warning 15: Multiple nodes with the same name: L0
+Warning 08: MSC (Stranka_1) has reference to nonexisting node: L1
OK: z120_test78 is correct, should be correct
mscdocument z120_test78;
Modified: trunk/tests/z120_test/z120_test79.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test79.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test79.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 15: Two or more nodes with the same name: L0
-Warning 08: MSC (Stranka_1) has reference to nonexisted node: L1
+Warning 15: Multiple nodes with the same name: L0
+Warning 08: MSC (Stranka_1) has reference to nonexisting node: L1
OK: z120_test79 is correct, should be correct
mscdocument z120_test79;
Modified: trunk/tests/z120_test/z120_test80.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test80.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test80.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,8 +1,8 @@
-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
+Warning 15: Multiple nodes with the same name: L0
+Warning 15: Multiple nodes with the same name: L1
+Warning 15: Multiple nodes with the same name: L2
+Warning 15: Multiple nodes with the same name: L3
+Warning 09: Reference to nonexisting MSC: Denied
OK: z120_test80 is correct, should be correct
mscdocument z120_test80;
Modified: trunk/tests/z120_test/z120_test81.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test81.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test81.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,6 +1,6 @@
-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
+Warning 15: Multiple nodes with the same name: L0
+Warning 08: MSC (Stranka_1) has reference to nonexisting node: L1
+Warning 09: Reference to nonexisting MSC: Accept, Denied
OK: z120_test81 is correct, should be correct
mscdocument z120_test81;
Modified: trunk/tests/z120_test/z120_test82.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test82.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test82.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 15: Two or more nodes with the same name: L2
-Warning 09: Reference to nonexisted MSC: Accept, Denied
+Warning 15: Multiple nodes with the same name: L2
+Warning 09: Reference to nonexisting MSC: Accept, Denied
OK: z120_test82 is correct, should be correct
mscdocument z120_test82;
Modified: trunk/tests/z120_test/z120_test83.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test83.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test83.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,6 +1,6 @@
z120_test83.mpr[10,4] Cannot match to any predicted input.
-Warning 08: MSC (Stranka1) has reference to nonexisted node: L1, L5
-Warning 09: Reference to nonexisted MSC: NAME1
+Warning 08: MSC (Stranka1) has reference to nonexisting node: L1, L5
+Warning 09: Reference to nonexisting MSC: NAME1
OK: z120_test83 is correct, should be correct
mscdocument z120_test83;
Modified: trunk/tests/z120_test/z120_test84.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test84.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_test84.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,5 +1,5 @@
-Warning 17: Two or more events with the same name: e0
-Warning 05: There is complete message (a,0) with only one event
+Warning 17: Multiple events with the same name: e0
+Warning 05: Complete message (a,0) with only one event
OK: z120_test84 is correct, should be correct
mscdocument z120_test84;
Added: trunk/tests/z120_test/z120_test85.mpr
===================================================================
--- trunk/tests/z120_test/z120_test85.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test85.mpr 2009-11-03 00:56:27 UTC (rev 449)
@@ -0,0 +1,35 @@
+/***********************************************
+Example of MSC where two MSC has the same name and one reference is to nondefined MSC.
+***********************************************/
+
+mscdocument Vykres2;
+msc Stranka_1;
+initial connect L0;
+L0: reference One connect L1;
+L1: reference Two connect L2;
+L2: final;
+endmsc;
+
+msc One;
+A: instance;
+B: instance;
+A: in A,1 from found;
+A: out jedna,2 to B;
+B: in jedna,2 from A;
+A: concurrent;
+A: out B1 to B;
+B: in B1 from A;
+A: out B,4 to lost;
+A: endconcurrent;
+A: endinstance;
+B: endinstance;
+endmsc;
+
+msc Two;
+ONE: instance;
+TWO: instance;
+ONE: out a,1 to TWO;
+TWO: in a,1 from ONE;
+ONE: endinstance;
+TWO: endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test85.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test85.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test85.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -0,0 +1,35 @@
+OK: z120_test85 is correct, should be correct
+
+mscdocument z120_test85;
+msc Stranka_1;
+initial connect L0;
+L0: reference One connect L1;
+L1: reference Two connect L2;
+L2: final;
+endmsc;
+msc One;
+inst A;
+inst B;
+A: instance;
+in A,0 from found;
+out jedna,1 to B;
+concurrent;
+out B1,2 to B;
+out B,3 to lost;
+endconcurrent;
+endinstance;
+B: instance;
+in jedna,1 from A;
+in B1,2 from A;
+endinstance;
+endmsc;
+msc Two;
+inst ONE;
+inst TWO;
+ONE: instance;
+out a,0 to TWO;
+endinstance;
+TWO: instance;
+in a,0 from ONE;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test86.mpr
===================================================================
--- trunk/tests/z120_test/z120_test86.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test86.mpr 2009-11-03 00:56:27 UTC (rev 449)
@@ -0,0 +1,20 @@
+/******************************************************
+Example of bMSC where two events have the same name (incomplete input message)
+******************************************************/
+
+msc Stranka1;
+inst NAME1;
+inst NAME2;
+NAME1: instance;
+concurrent;
+label e1; out b,1 to NAME2 before e0;
+in a,0 from NAME2;
+in a,0 from found before e1;
+endconcurrent;
+endinstance;
+NAME2: instance;
+out a,0 to NAME1 before r1;
+in b,1 from NAME1;
+endinstance;
+endmsc;
+
Modified: trunk/tests/z120_test/z120_time11.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time11.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_time11.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 09: Reference to nonexisted MSC: Fish
+Warning 09: Reference to nonexisting MSC: Fish
OK: z120_time11 is correct, should be correct
mscdocument z120_time11;
Modified: trunk/tests/z120_test/z120_time12.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time12.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_time12.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 09: Reference to nonexisted MSC: Fish
+Warning 09: Reference to nonexisting MSC: Fish
OK: z120_time12 is correct, should be correct
mscdocument z120_time12;
Modified: trunk/tests/z120_test/z120_time13.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time13.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_time13.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 24: Time information to non-existed reference node: L2
+Warning 24: Time information to nonexisting 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-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_time15.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 24: Time information to non-existed reference node: L2
+Warning 24: Time information to nonexisting reference node: L2
OK: z120_time15 is correct, should be correct
mscdocument z120_time15;
Modified: trunk/tests/z120_test/z120_time16.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time16.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_time16.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 24: Time information to non-existed reference node: L2
+Warning 24: Time information to nonexisting reference node: L2
OK: z120_time16 is correct, should be correct
mscdocument z120_time16;
Modified: trunk/tests/z120_test/z120_time17.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time17.mpr.result 2009-10-28 19:26:56 UTC (rev 448)
+++ trunk/tests/z120_test/z120_time17.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -1,4 +1,4 @@
-Warning 24: Time information to non-existed reference node: L2
+Warning 24: Time information to nonexisting reference node: L2
OK: z120_time17 is correct, should be correct
mscdocument z120_time17;
Added: trunk/tests/z120_test/z120_time18.mpr
===================================================================
--- trunk/tests/z120_test/z120_time18.mpr (rev 0)
+++ trunk/tests/z120_test/z120_time18.mpr 2009-11-03 00:56:27 UTC (rev 449)
@@ -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 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_time18.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time18.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_time18.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -0,0 +1,20 @@
+Warning 24: Time information to nonexisting reference node: L2
+OK: z120_time18 is correct, should be correct
+
+mscdocument z120_time18;
+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_time19.mpr
===================================================================
--- trunk/tests/z120_test/z120_time19.mpr (rev 0)
+++ trunk/tests/z120_test/z120_time19.mpr 2009-11-03 00:56:27 UTC (rev 449)
@@ -0,0 +1,22 @@
+/*****************************************************
+Simple test of bmsc (event driven notification)
+
+message without identification
+time definition (event driven)
+******************************************************/
+
+mscdocument bbb;
+msc pok2;
+A: instance;
+B: instance;
+A: in A,1 from found;
+A: out jedna,2 to B;
+B: in jedna,2 from A;
+A: concurrent;
+A: label e0; out B1 to B;
+B: in B1 from A;
+A: label e1; out B,4 to lost before e0; time e0 [12];
+A: endconcurrent;
+A: endinstance;
+B: endinstance;
+endmsc;
Property changes on: trunk/tests/z120_test/z120_time19.mpr
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/tests/z120_test/z120_time19.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time19.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_time19.mpr.result 2009-11-03 00:56:27 UTC (rev 449)
@@ -0,0 +1,22 @@
+OK: z120_time19 is correct, should be correct
+
+mscdocument z120_time19;
+msc pok2;
+inst A;
+inst B;
+A: instance;
+in A,0 from found;
+out jedna,1 to B;
+concurrent;
+label e0;
+out B,2 to lost before e1;
+time e1 [12];
+label e1;
+out B1,3 to B;
+endconcurrent;
+endinstance;
+B: instance;
+in jedna,1 from A;
+in B1,3 from A;
+endinstance;
+endmsc;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
