Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[444] trunk
|
From: <ma...@us...> - 2009-10-27 00:44:51
|
Revision: 444
http://scstudio.svn.sourceforge.net/scstudio/?rev=444&view=rev
Author: madzin
Date: 2009-10-27 00:44:29 +0000 (Tue, 27 Oct 2009)
Log Message:
-----------
New parser error messages
Modified Paths:
--------------
trunk/src/data/Z120/Context.cpp
trunk/src/data/Z120/Context_Impl.h
trunk/src/data/Z120/Z120.g
trunk/src/data/msc_types.h
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_test39.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
trunk/tests/z120_test/z120_test50.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
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_time11.mpr.result
trunk/tests/z120_test/z120_time12.mpr.result
Added Paths:
-----------
trunk/tests/z120_test/z120_test66.mpr
trunk/tests/z120_test/z120_test67.mpr
trunk/tests/z120_test/z120_test67.mpr.result
trunk/tests/z120_test/z120_test68.mpr
trunk/tests/z120_test/z120_test68.mpr.result
trunk/tests/z120_test/z120_test69.mpr
trunk/tests/z120_test/z120_test69.mpr.result
trunk/tests/z120_test/z120_test70.mpr
trunk/tests/z120_test/z120_test71.mpr
trunk/tests/z120_test/z120_test71.mpr.result
trunk/tests/z120_test/z120_test72.mpr
trunk/tests/z120_test/z120_test72.mpr.result
trunk/tests/z120_test/z120_test73.mpr
trunk/tests/z120_test/z120_test73.mpr.result
trunk/tests/z120_test/z120_test74.mpr
trunk/tests/z120_test/z120_test74.mpr.result
trunk/tests/z120_test/z120_test75.mpr
trunk/tests/z120_test/z120_test75.mpr.result
trunk/tests/z120_test/z120_test76.mpr
trunk/tests/z120_test/z120_test76.mpr.result
trunk/tests/z120_test/z120_test77.mpr
trunk/tests/z120_test/z120_test78.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
trunk/tests/z120_test/z120_test83.mpr.result
Modified: trunk/src/data/Z120/Context.cpp
===================================================================
--- trunk/src/data/Z120/Context.cpp 2009-10-26 16:06:25 UTC (rev 443)
+++ trunk/src/data/Z120/Context.cpp 2009-10-27 00:44:29 UTC (rev 444)
@@ -22,7 +22,7 @@
*/
/*
- * Maximal number of warning/error message is 29
+ * Maximal number of warning/error message is 30
*/
#ifndef __ParserStruct__
@@ -73,6 +73,9 @@
context->instance_parameter_decl = false;
context->message_parameter_decl = false;
context->timer_parameter_decl = false;
+ context->error_inst_names.clear();
+ context->error_nodes_names.clear();
+ context->error_event_names.clear();
context->start_node = NULL;
context->end_node = std::make_pair("", context->end_node.second); //replaice context->end_node.second with NULL
@@ -110,36 +113,23 @@
{
if(context->nonpointed.size() > 1)
{
- context->z->print_report(RS_WARNING, L"Warning 02: There are more unreferenced MSC\n");
+ std::string names = "";
+ for(std::set<std::string>::iterator it = context->nonpointed.begin(); it != context->nonpointed.end(); it++)
+ {
+ if(it != context->nonpointed.begin())
+ {
+ names += ", ";
+ }
+ names += *it;
+ }
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 02: There are more unreferenced MSC: " << TOWSTRING(names));
}
if(context->nonpointed.size() < 1 && context->mscs.size() > 0)
{
- context->z->print_report(RS_ERROR, L"Error 03: There is no MSC without reference\n");
+ context->z->print_report(RS_ERROR, L"Error 03: There is infinite recursion among MSCs");
}
- if(context->open_instance > 0)
- {
- if(context->open_instance == 1)
- {
- context->z->print_report(RS_WARNING, stringize() << "Warning 20: Msc has not finished " << context->open_instance << " instance\n");
- }
- else
- {
- context->z->print_report(RS_WARNING, stringize() << "Warning 20: Msc has not finished " << context->open_instance << " instances\n");
- }
- }
-
- if(context->open_instance < 0)
- {
- context->z->print_report(RS_WARNING, L"Warning 21: Some instance has been finished more times\n");
- }
-
- if(context->future_top_time_relations.size() > 0 || context->future_bottom_time_relations.size() > 0)
- {
- context->z->print_report(RS_WARNING, L"Warning 24: Some time information points to non-existed reference node\n");
- }
-
s_Msc** result = NULL;
if(context->mscs.size() > 0){
@@ -175,7 +165,8 @@
}
result[position] = NULL;
- }
+ }
+
return result;
}
@@ -206,11 +197,28 @@
*/
void check_collections_fun(struct Context* context)
{
- if(!context->coregion_area_opened.empty())
- context->z->print_report(RS_WARNING, stringize() << "Warning 04: Instance " << TOWSTRING(context->element_name) << " does not have finished some coregion\n");
+ if(!context->coregion_area_opened.empty())
+ {
+ std::string names = "";
+ for(std::set<std::string>::iterator it = context->coregion_area_opened.begin(); it != context->coregion_area_opened.end(); it++)
+ {
+ if(it != context->coregion_area_opened.begin())
+ {
+ names += ", ";
+ }
+ names += *it;
+ }
+ context->z->print_report(RS_WARNING, stringize() << "Warning 04: Instances which does not have finished coretion: " << TOWSTRING(names));
+ context->coregion_area_opened.clear();
+ }
if(!context->messages.empty()){
- context->z->print_report(RS_WARNING, L"Warning 05: There is complete message with only one event\n");
+ std::map<std::string, CompleteMessagePtr>::iterator it;
+
+ 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");
+ }
IncompleteMessagePtr message;
std::multimap<std::string, CompleteMessagePtr>::iterator msg_it;
@@ -237,30 +245,45 @@
context->z->print_report(RS_WARNING, L"Warning 07: There is reference to nonexisted event\n");
}
- if(!context->future_connections.empty()){
- context->z->print_report(RS_WARNING, L"Warning 08: There is reference to nonexisted node\n");
+ if(!context->future_connections.empty()){
+ std::map<std::string, std::set<std::string> >::iterator it;
+ std::string names;
+
+ for(it = context->future_connections.begin(); it != context->future_connections.end(); ++it)
+ {
+ if(it != context->future_connections.begin())
+ {
+ names += ", ";
+ }
+
+ 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->future_connections.clear();
}
if(context->open_instance > 0)
{
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\n");
+ context->z->print_report(RS_WARNING, stringize() << "Warning 20: MSC (" << TOWSTRING(context->msc_name) << ") has not finished " << 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\n");
+ context->z->print_report(RS_WARNING, stringize() << "Warning 20: MSC " << TOWSTRING(context->msc_name) << " has not finished " << context->open_instance << " instances");
}
}
if(context->open_instance < 0)
{
- context->z->print_report(RS_WARNING, L"Warning 21:TOWSTRING(context->msc_name) Some instance has been finished more times\n");
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 21: Instance in MSC (" << TOWSTRING(context->msc_name) << ") has been finished more times");
}
if(context->future_top_time_relations.size() > 0)
{
- context->z->print_report(RS_WARNING, L"Warning 24: Some time information points to non-existed reference node\n");
+ 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;
@@ -279,7 +302,7 @@
if(context->future_bottom_time_relations.size() > 0)
{
- context->z->print_report(RS_WARNING, L"Warning 24: Some time information points to non-existed reference node\n");
+ 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;
@@ -296,29 +319,43 @@
context->future_bottom_time_relations.clear();
}
+ context->error_inst_names.clear();
+ context->error_nodes_names.clear();
+ context->error_event_names.clear();
+
}
void check_references_fun(struct Context* context)
{
if(!context->future_reference.empty()){
- context->z->print_report(RS_WARNING, L"Warning 09: There is reference to nonexisted MSC\n");
std::map<std::string, std::set<ReferenceNodePtr> >::iterator map_it;
std::set<ReferenceNodePtr>::iterator ref_it;
+ std::string names = "";
for(map_it=context->future_reference.begin(); map_it!=context->future_reference.end(); ++map_it){
BMscPtr bmsc = new BMsc(TOWSTRING(map_it->first));
+ if(map_it != context->future_reference.begin())
+ {
+ names += ", ";
+ }
+ names += map_it->first;
for(ref_it=map_it->second.begin(); ref_it!=map_it->second.end(); ++ref_it){
(*ref_it)->set_msc(bmsc);
}
}
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 09: Reference to nonexisted MSC: " << TOWSTRING(names));
}
}
void msc_was_read_fun(struct Context* context)
{
if(context->mscs.find(context->msc_name) != context->mscs.end()){
- context->z->print_report(RS_WARNING, stringize() << "Warning 18: Two mscs have the same name (" << TOWSTRING(context->msc_name) << ")\n");
+ 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->error_mscs_names.insert(context->msc_name);
+ }
}
context->mscs.insert(std::make_pair(context->msc_name, get_msc_fun(context)));
@@ -412,7 +449,7 @@
context->myBmsc->add_instance(instance);
context->open_instance++;
context->z->print_report(RS_WARNING,
- stringize() << "Warning 23: Instance (" << TOWSTRING(context->element_name) << ") has not been started (e.g. " << TOWSTRING(context->element_name) << ": instance;)\n");
+ stringize() << "Warning 23: Instance (" << TOWSTRING(context->element_name) << ") has not been started (e.g. " << TOWSTRING(context->element_name) << ": instance;)");
}
else
{
@@ -486,8 +523,13 @@
void new_instance_fun(struct Context* context)
{
InstancePtr instance(new Instance(TOWSTRING(context->element_name)));
- if(context->instances.find(context->element_name) != context->instances.end()){
- context->z->print_report(RS_WARNING, stringize() << L"Warning 16: Instance with the same name (" << TOWSTRING(context->element_name) << ") has been created\n");
+ if(context->instances.find(context->element_name) != context->instances.end())
+ {
+ 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->error_inst_names.insert(context->element_name);
+ }
}
else{
context->instances.insert(std::make_pair(context->element_name, instance));
@@ -516,7 +558,8 @@
}
else
{
- context->z->print_report(RS_WARNING, stringize() << "Warning 10: Instance " << TOWSTRING(context->element_name) << " has already had open some coregion\n");
+ context->z->print_report(RS_WARNING, stringize() << "Warning 10: Instance (" << TOWSTRING(context->element_name) << ") has overlapped coregions");
+
}
}
@@ -534,7 +577,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 open any coregion\n"); //check
}
}
@@ -581,7 +624,7 @@
context->myBmsc->add_instance(instance);
context->open_instance++;
context->z->print_report(RS_WARNING,
- stringize() << "Warning 23: Instance (" << TOWSTRING(context->element_name) << ") has not been started (e.g. " << TOWSTRING(context->element_name) << ": instance;)\n");
+ stringize() << "Warning 23: Instance (" << TOWSTRING(context->element_name) << ") has not been started (e.g. " << TOWSTRING(context->element_name) << ": instance;)");
}
else
{
@@ -720,7 +763,11 @@
}
else{
context->not_create_event = 1;
- context->z->print_report(RS_WARNING, stringize() << L"Warning 17: Event with the same name (" << TOWSTRING(name) << ") has been created\n");
+ if(context->error_inst_names.find(context->element_name) == context->error_inst_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);
+ }
}
}
@@ -732,7 +779,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 " << TOWSTRING(context->element_name) << " instance\n");
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 19: There is message without label on the instance (" << TOWSTRING(context->element_name) << ")");
}
void end_instance_fun(struct Context* context){
@@ -975,7 +1022,12 @@
}
else
{
- context->z->print_report(RS_WARNING, stringize() << "Warning 15: The node " << TOWSTRING(context->element_name) << " has been created\n");
+ 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->error_nodes_names.insert(context->element_name);
+ }
+
context->not_connect = 1;
}
}
@@ -997,7 +1049,12 @@
}
else
{
- context->z->print_report(RS_WARNING, stringize() << "Warning 15: The node " << TOWSTRING(context->element_name) << " has been created\n");
+ 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->error_nodes_names.insert(context->element_name);
+ }
+
context->not_connect = 1;
}
}
@@ -1019,7 +1076,12 @@
}
else
{
- context->z->print_report(RS_WARNING, stringize() << "Warning 15: The node " << TOWSTRING(context->element_name) << " has been created\n");
+ 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->error_nodes_names.insert(context->element_name);
+ }
+
context->not_connect = 1;
}
}
@@ -1215,7 +1277,7 @@
if(node == NULL)
{
- context->z->print_report(RS_ERROR, L"Warning 23: Time information can be defined only to a reference node\n");
+ context->z->print_report(RS_ERROR, L"Warning 23: Time information can be defined only to a reference node");
return ;
}
@@ -1224,7 +1286,7 @@
ReferenceNodePtr node2 = boost::dynamic_pointer_cast<ReferenceNode>(ref_it->second);
if(node == NULL)
{
- context->z->print_report(RS_ERROR, L"Warning 23: Time information can be defined only to a reference node\n");
+ context->z->print_report(RS_ERROR, L"Warning 23: Time information can be defined only to a reference node");
return ;
}
Modified: trunk/src/data/Z120/Context_Impl.h
===================================================================
--- trunk/src/data/Z120/Context_Impl.h 2009-10-26 16:06:25 UTC (rev 443)
+++ trunk/src/data/Z120/Context_Impl.h 2009-10-27 00:44:29 UTC (rev 444)
@@ -64,6 +64,14 @@
bool origin;
/*
+ * Error handling
+ */
+ std::set<std::string> error_inst_names; //names of instances which were declared more times (two or more instances with the same name)
+ 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
+
+ /*
* BMsc
*/
BMscPtr myBmsc;
@@ -83,6 +91,7 @@
int no_message_label; //flag for message which does not have label
int open_instance; //counter of open instances
+
//variables for syntactic grammar solutions
bool data_parameter_decl;
bool instance_parameter_decl;
Modified: trunk/src/data/Z120/Z120.g
===================================================================
--- trunk/src/data/Z120/Z120.g 2009-10-26 16:06:25 UTC (rev 443)
+++ trunk/src/data/Z120/Z120.g 2009-10-27 00:44:29 UTC (rev 444)
@@ -254,11 +254,13 @@
// ----- Basic MSC
+
+//add nonstrict endmsc "(endmac end)?" for better error message handling
message_sequence_chart:
{
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)?
{
check_collections_fun(context);
msc_was_read_fun(context);
@@ -1431,7 +1433,7 @@
}
':' 'final' (connection_list
{
- bug_report_fun(context, "Warinig 14: HMSC has defined a successor for end node\n");
+ bug_report_fun(context, "Warinig 14: HMSC has defined a successor for end node");
})? end
{
new_end_node_fun(context);
Modified: trunk/src/data/msc_types.h
===================================================================
--- trunk/src/data/msc_types.h 2009-10-26 16:06:25 UTC (rev 443)
+++ trunk/src/data/msc_types.h 2009-10-27 00:44:29 UTC (rev 444)
@@ -22,6 +22,7 @@
#include "data/fcmp.h"
#include "data/export.h"
+#include <algorithm>
#include <list>
#include <map>
#include <string>
Modified: trunk/tests/z120_test/CMakeLists.txt
===================================================================
--- trunk/tests/z120_test/CMakeLists.txt 2009-10-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/CMakeLists.txt 2009-10-27 00:44:29 UTC (rev 444)
@@ -86,6 +86,24 @@
ADD_Z120_TEST(z120_test63.mpr 1)
ADD_Z120_TEST(z120_test64.mpr 1)
ADD_Z120_TEST(z120_test65.mpr 1)
+ADD_Z120_TEST(z120_test66.mpr 1)
+ADD_Z120_TEST(z120_test67.mpr 1)
+ADD_Z120_TEST(z120_test68.mpr 1)
+ADD_Z120_TEST(z120_test69.mpr 1)
+ADD_Z120_TEST(z120_test70.mpr 1)
+ADD_Z120_TEST(z120_test71.mpr 1)
+ADD_Z120_TEST(z120_test72.mpr 1)
+ADD_Z120_TEST(z120_test73.mpr 1)
+ADD_Z120_TEST(z120_test74.mpr 1)
+ADD_Z120_TEST(z120_test75.mpr 1)
+ADD_Z120_TEST(z120_test76.mpr 1)
+ADD_Z120_TEST(z120_test77.mpr 1)
+ADD_Z120_TEST(z120_test78.mpr 1)
+ADD_Z120_TEST(z120_test79.mpr 1)
+ADD_Z120_TEST(z120_test80.mpr 1)
+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_time01.mpr 1)
ADD_Z120_TEST(z120_time02.mpr 1)
Modified: trunk/tests/z120_test/z120_test01.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test01.mpr.result 2009-10-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test01.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,7 +1,4 @@
-Warning 20: Msc (z120_test01) has not finished 1 instance
-
-Warning 20: Msc has not finished 1 instance
-
+Warning 20: MSC (z120_test01) has not finished 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test02.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
-Warning 09: There is reference to nonexisted MSC
-
+Warning 09: Reference to nonexisted 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test04.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
-Warning 09: There is reference to nonexisted MSC
-
+Warning 09: Reference to nonexisted 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test09.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
-Warning 16: Instance with the same name (NAME) has been created
-
+Warning 16: Two or more 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test18.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
-Warning 02: There are more unreferenced MSC
-
+Warning 02: There are more 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test21.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
-Warning 02: There are more unreferenced MSC
-
+Warning 02: There are more 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test24.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
-Warning 16: Instance with the same name (NAME) has been created
-
+Warning 16: Two or more 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test25.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,7 +1,5 @@
-Warning 16: Instance with the same name (NAME) has been created
-
-Warning 18: Two mscs have the same name (Stranka_1)
-
+Warning 16: Two or more instances with the same name: NAME
+Warning 18: Two or more 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test27.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
-Warning 16: Instance with the same name (NAME) has been created
-
+Warning 16: Two or more 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test28.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,7 +1,5 @@
-Warning 15: The node L1 has been created
-
-Warning 09: There is reference to nonexisted MSC
-
+Warning 15: Two or more nodes with the same name: L1
+Warning 09: Reference to nonexisted 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test29.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,7 +1,5 @@
-Warning 15: The node L1 has been created
-
-Warning 09: There is reference to nonexisted MSC
-
+Warning 15: Two or more nodes with the same name: L1
+Warning 09: Reference to nonexisted 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test30.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,7 +1,5 @@
-Warning 15: The node L1 has been created
-
-Warning 09: There is reference to nonexisted MSC
-
+Warning 15: Two or more nodes with the same name: L1
+Warning 09: Reference to nonexisted 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test31.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,7 +1,5 @@
-Warning 09: There is reference to nonexisted MSC
-
-Error 03: There is no MSC without reference
-
+Warning 09: Reference to nonexisted MSC: bmsc1
+Error 03: There is 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test32.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
-Warning 17: Event with the same name (e1) has been created
-
+Warning 17: Two or more 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test33.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
-Warning 17: Event with the same name (e0) has been created
-
+Warning 17: Two or more 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test34.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
-Warning 17: Event with the same name (e1) has been created
-
+Warning 17: Two or more 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test35.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
-Warning 17: Event with the same name (e0) has been created
-
+Warning 17: Two or more 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test37.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,7 +1,5 @@
-Warning 19: There is message without label on the ONE instance
-
-Warning 19: There is message without label on the TWO instance
-
+Warning 19: There is message without label on the instance (ONE)
+Warning 19: There is 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test38.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,7 +1,5 @@
-Warning 18: Two mscs have the same name (Two)
-
-Warning 02: There are more unreferenced MSC
-
+Warning 18: Two or more MSCs have the same name: Two
+Warning 02: There are more unreferenced MSC: Stranka_1, Trick, Two
OK: z120_test38 is correct, should be correct
mscdocument z120_test38;
Modified: trunk/tests/z120_test/z120_test39.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test39.mpr.result 2009-10-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test39.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
Warinig 14: HMSC has defined a successor for end node
-
OK: z120_test39 is correct, should be correct
mscdocument z120_test39;
Modified: trunk/tests/z120_test/z120_test40.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test40.mpr.result 2009-10-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test40.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,7 +1,5 @@
-Warning 18: Two mscs have the same name (Stranka_1)
-
-Warning 09: There is reference to nonexisted MSC
-
+Warning 18: Two or more MSCs have the same name: Stranka_1
+Warning 09: Reference to nonexisted 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test41.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,7 +1,5 @@
-Warning 19: There is message without label on the ONE instance
-
-Warning 19: There is message without label on the TWO instance
-
+Warning 19: There is message without label on the instance (ONE)
+Warning 19: There is 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test45.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
-Warning 05: There is complete message with only one event
-
+Warning 05: There is 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test49.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,7 +1,5 @@
-Warning 08: There is reference to nonexisted node
-
-Warning 09: There is reference to nonexisted MSC
-
+Warning 08: MSC (Stranka1) has reference to nonexisted node: L3
+Warning 09: Reference to nonexisted MSC: NAME, NAME1
OK: z120_test49 is correct, should be correct
mscdocument z120_test49;
Modified: trunk/tests/z120_test/z120_test50.mpr
===================================================================
--- trunk/tests/z120_test/z120_test50.mpr 2009-10-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test50.mpr 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,7 @@
/*************************************************
Simple test of HMSC
+
+Node L1 is defined wrongly.
**************************************************/
msc Stranka1;
Modified: trunk/tests/z120_test/z120_test50.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test50.mpr.result 2009-10-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test50.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,8 +1,6 @@
-z120_test50.mpr[8,4] Cannot match to any predicted input.
-Warning 08: There is reference to nonexisted node
-
-Warning 09: There is reference to nonexisted MSC
-
+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
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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test51.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
-Warning 05: There is complete message with only one event
-
+Warning 05: There is 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_test54.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test54.mpr.result 2009-10-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test54.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
Warning 23: Instance (A) has not been started (e.g. A: instance;)
-
OK: z120_test54 is correct, should be correct
mscdocument z120_test54;
Modified: trunk/tests/z120_test/z120_test55.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test55.mpr.result 2009-10-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test55.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,5 +1,4 @@
Warning 23: Instance (A) has not been started (e.g. A: instance;)
-
OK: z120_test55 is correct, should be correct
mscdocument z120_test55;
Modified: trunk/tests/z120_test/z120_test58.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test58.mpr.result 2009-10-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test58.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -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 open any 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test59.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -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 open any 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test61.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,7 +1,7 @@
z120_test61.mpr[10,0] Missing ';'.
z120_test61.mpr[12,0] Missing ';'.
-Warning 05: There is complete message with only one event
-
+Warning 05: There is complete message (tric,3) with only one event
+Warning 05: There is 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test62.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,8 +1,5 @@
z120_test62.mpr[10,5] Missing elements.
-Warning 20: Msc (test01) has not finished 1 instance
-
-Warning 20: Msc has not finished 1 instance
-
+Warning 20: MSC (test01) has not finished 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test63.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,6 +1,5 @@
z120_test63.mpr[4,5] Cannot match to any predicted input.
-Warning 09: There is reference to nonexisted MSC
-
+Warning 09: Reference to nonexisted 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test64.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -3,14 +3,10 @@
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 some coregion
-
+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
-Warning 20: Msc has not finished 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-26 16:06:25 UTC (rev 443)
+++ trunk/tests/z120_test/z120_test65.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -1,8 +1,6 @@
z120_test65.mpr[13,7] Cannot match to any predicted input.
-Warning 16: Instance with the same name (NAME) has been created
-
-Warning 02: There are more unreferenced MSC
-
+Warning 16: Two or more instances with the same name: NAME
+Warning 02: There are more unreferenced MSC: One, Stranka_1, Two
OK: z120_test65 is correct, should be correct
mscdocument z120_test65;
Added: trunk/tests/z120_test/z120_test66.mpr
===================================================================
--- trunk/tests/z120_test/z120_test66.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test66.mpr 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,30 @@
+/***********************************************
+Example of bMSC
+
+missing: endmsc;
+***********************************************/
+
+mscdocument Vkres2;
+msc Strnka1;
+inst client;
+inst server;
+client: instance;
+concurrent;
+label e0; out no,0 to server;
+label e1; in know,1 from server;
+endconcurrent;
+out yes,2 to lost;
+concurrent;
+label e2; 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;
+endconcurrent;
+concurrent;
+label e4; out tric,3 to client;
+endconcurrent;
+endinstance;
Added: trunk/tests/z120_test/z120_test67.mpr
===================================================================
--- trunk/tests/z120_test/z120_test67.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test67.mpr 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,45 @@
+/*************************************************
+Example of HMSC with references to bMSC (unordered bMSC definitions)
+
+bmsc1: doesn't finish two instances.
+*************************************************/
+
+mscdocument Vkres1;
+msc Strnka1;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference bmsc2 connect L3;
+L2: reference bmsc1 connect L3;
+L3: reference bmsc3 connect L4;
+L4: final;
+endmsc;
+msc bmsc1;
+inst A;
+inst B;
+A: instance;
+out yes,0 to B;
+B: instance;
+in yes,0 from A;
+endmsc;
+msc bmsc2;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+endinstance;
+B: instance;
+out no,0 to A;
+endinstance;
+endmsc;
+msc bmsc3;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+out ok,1 to B;
+endinstance;
+B: instance;
+out no,0 to A;
+in ok,1 from A;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test67.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test67.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test67.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,44 @@
+Warning 20: MSC bmsc1 has not finished 2 instances
+OK: z120_test67 is correct, should be correct
+
+mscdocument z120_test67;
+msc Strnka1;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference bmsc2 connect L3;
+L2: reference bmsc1 connect L3;
+L3: reference bmsc3 connect L4;
+L4: final;
+endmsc;
+msc bmsc1;
+inst A;
+inst B;
+A: instance;
+out yes,0 to B;
+endinstance;
+B: instance;
+in yes,0 from A;
+endinstance;
+endmsc;
+msc bmsc2;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+endinstance;
+B: instance;
+out no,0 to A;
+endinstance;
+endmsc;
+msc bmsc3;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+out ok,1 to B;
+endinstance;
+B: instance;
+out no,0 to A;
+in ok,1 from A;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test68.mpr
===================================================================
--- trunk/tests/z120_test/z120_test68.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test68.mpr 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,32 @@
+/***********************************************
+Example of bMSC
+
+line 21: instance is finishing two times
+***********************************************/
+
+mscdocument Vkres2;
+msc Strnka1;
+inst client;
+inst server;
+client: instance;
+concurrent;
+label e0; out no,0 to server;
+label e1; in know,1 from server;
+endconcurrent;
+out yes,2 to lost;
+concurrent;
+label e2; in tric,3 from server;
+endconcurrent;
+in tric,4 from found;
+endinstance;
+endinstance;
+server: instance;
+in no,0 from client;
+concurrent;
+label e3; out know,1 to client;
+endconcurrent;
+concurrent;
+label e4; out tric,3 to client;
+endconcurrent;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test68.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test68.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test68.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,28 @@
+Warning 21: Instance in MSC (Strnka1) has been finished more times
+OK: z120_test68 is correct, should be correct
+
+mscdocument z120_test68;
+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_test69.mpr
===================================================================
--- trunk/tests/z120_test/z120_test69.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test69.mpr 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,30 @@
+/*************************************************
+Example of bMSC with coregion (used '_' sign)
+
+line 24: event e1 does not exist.
+*************************************************/
+
+mscdocument Vkres1;
+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;
+in request_b,4 from PC;
+label e0;
+out result,5 to PC;
+endconcurrent;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test69.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test69.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test69.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,30 @@
+Warning 06: There is dependency on nonexisted event
+
+OK: z120_test69 is correct, should be correct
+
+mscdocument z120_test69;
+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;
Added: trunk/tests/z120_test/z120_test70.mpr
===================================================================
--- trunk/tests/z120_test/z120_test70.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test70.mpr 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,26 @@
+mscdocument z120_test69;
+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;
Added: trunk/tests/z120_test/z120_test71.mpr
===================================================================
--- trunk/tests/z120_test/z120_test71.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test71.mpr 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,35 @@
+/***********************************************
+Example of bMSC
+
+line 33: message without identification
+***********************************************/
+mscdocument test11.vsd;
+msc Strnka1;
+inst A;
+inst B;
+
+A: instance;
+concurrent;
+label e0; out ano,0 to B;
+label e2; in nie,2 from B;
+endconcurrent;
+concurrent;
+label e3; out micron,3 to B;
+endconcurrent;
+in dan,5 from B;
+in track,6 from B;
+endinstance;
+
+B: instance;
+concurrent;
+label e6; out nie,2 to A;
+label e7; in ano,0 from A;
+endconcurrent;
+in micron,3 from A;
+concurrent;
+label e8; out dan,5 to A;
+endconcurrent;
+out track,6 to A;
+in rad from found;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test71.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test71.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test71.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,30 @@
+OK: z120_test71 is correct, should be correct
+
+mscdocument z120_test71;
+msc Strnka1;
+inst A;
+inst B;
+A: instance;
+concurrent;
+out ano,0 to B;
+in nie,1 from B;
+endconcurrent;
+concurrent;
+out micron,2 to B;
+endconcurrent;
+in dan,3 from B;
+in track,4 from B;
+endinstance;
+B: instance;
+concurrent;
+out nie,1 to A;
+in ano,0 from A;
+endconcurrent;
+in micron,2 from A;
+concurrent;
+out dan,3 to A;
+endconcurrent;
+out track,4 to A;
+in rad,5 from found;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test72.mpr
===================================================================
--- trunk/tests/z120_test/z120_test72.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test72.mpr 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,30 @@
+/************************************************
+Example of bMSC with before, after relation between messages.
+
+line 23: coregion starts two times.
+************************************************/
+
+mscdocument Vkres1;
+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;
+concurrent;
+label e0; in request_a,3 from PC after e1;
+label e2; in request_b,4 from PC;
+label e1; out result,5 to PC;
+endconcurrent;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test72.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test72.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test72.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,27 @@
+Warning 10: Instance (Server) has overlapped coregions
+OK: z120_test72 is correct, should be correct
+
+mscdocument z120_test72;
+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;
+out result,5 to PC before e0;
+in request_b,4 from PC;
+label e0;
+in request_a,3 from PC;
+endconcurrent;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test73.mpr
===================================================================
--- trunk/tests/z120_test/z120_test73.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test73.mpr 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,21 @@
+/*****************************************************
+Simple test of bmsc (event driven notification)
+
+message without identification
+******************************************************/
+
+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: out B1 to B;
+B: in B1 from A;
+A: out B,4 to lost;
+A: endconcurrent;
+A: endinstance;
+B: endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test73.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test73.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test73.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,19 @@
+OK: z120_test73 is correct, should be correct
+
+mscdocument z120_test73;
+msc pok2;
+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;
Added: trunk/tests/z120_test/z120_test74.mpr
===================================================================
--- trunk/tests/z120_test/z120_test74.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test74.mpr 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,29 @@
+/***********************************************************
+ Two coregions has not finished.
+ ************************************************************/
+mscdocument Vykres1;
+msc Stranka_1;
+inst Yes;
+inst No;
+Yes: instance;
+out Tricky,0 to No;
+in normal,1 from No;
+concurrent;
+out easy,2 to No;
+in non_easy,3 from No;
+out non_easy,4 to No;
+in normal,5 from No;
+out easy,6 to No;
+endinstance;
+
+No: instance;
+in Tricky,0 from Yes;
+out normal,1 to Yes;
+in easy,2 from Yes;
+in non_easy,4 from Yes;
+out non_easy,3 to Yes;
+concurrent;
+out normal,5 to Yes;
+in easy,6 from Yes;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test74.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test74.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test74.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,30 @@
+Warning 04: Instances which does not have finished coretion: No, Yes
+OK: z120_test74 is correct, should be correct
+
+mscdocument z120_test74;
+msc Stranka_1;
+inst Yes;
+inst No;
+Yes: instance;
+out Tricky,0 to No;
+in normal,1 from No;
+concurrent;
+out easy,2 to No;
+in non_easy,3 from No;
+out non_easy,4 to No;
+in normal,5 from No;
+out easy,6 to No;
+endconcurrent;
+endinstance;
+No: instance;
+in Tricky,0 from Yes;
+out normal,1 to Yes;
+in easy,2 from Yes;
+in non_easy,4 from Yes;
+out non_easy,3 to Yes;
+concurrent;
+out normal,5 to Yes;
+in easy,6 from Yes;
+endconcurrent;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test75.mpr
===================================================================
--- trunk/tests/z120_test/z120_test75.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test75.mpr 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,26 @@
+/*****************************************************
+Example of MSC where three instances have the same name (NAME)
+*****************************************************/
+
+msc Trick;
+inst NAME;
+inst NAME;
+inst NAME;
+NAME: instance;
+out NAME,0 to NAME;
+out NAME,1 to NAME;
+endinstance;
+NAME: instance;
+in NAME,0 from NAME;
+endinstance;
+NAME: instance;
+in NAME,1 from NAME;
+endinstance;
+endmsc;
+
+msc Stranka_1;
+initial connect L0;
+L0: reference Trick connect L1;
+L1: final;
+endmsc;
+
Added: trunk/tests/z120_test/z120_test75.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test75.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test75.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,24 @@
+Warning 16: Two or more instances with the same name: NAME
+OK: z120_test75 is correct, should be correct
+
+mscdocument z120_test75;
+msc Stranka_1;
+initial connect L0;
+L0: reference Trick connect L1;
+L1: final;
+endmsc;
+msc Trick;
+inst NAME;
+inst NAME;
+inst NAME;
+NAME: instance;
+out NAME,0 to NAME;
+out NAME,1 to NAME;
+in NAME,0 from NAME;
+in NAME,1 from NAME;
+endinstance;
+NAME: instance;
+endinstance;
+NAME: instance;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test76.mpr
===================================================================
--- trunk/tests/z120_test/z120_test76.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test76.mpr 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,46 @@
+/***************************************************
+Example of document where two mscs have the same name (msc TWO)
+***************************************************/
+
+mscdocument Vykres2;
+
+msc Stranka_1;
+initial connect L0;
+L0: reference One connect L1;
+L1: reference Two connect L2;
+L2: final;
+endmsc;
+
+msc One;
+initial connect L0;
+L0: condition access connect L1;
+L1: final;
+endmsc;
+
+msc Trick;
+inst NAME;
+inst NAME2;
+NAME: instance;
+out NAME,0 to NAME2;
+endinstance;
+NAME2: instance;
+in NAME,0 from NAME;
+endinstance;
+endmsc;
+
+msc Two;
+inst Second;
+inst First;
+Second: instance;
+out true,0 to First;
+endinstance;
+First: instance;
+in true,0 from Second;
+endinstance;
+endmsc;
+
+msc Two;
+endmsc;
+
+msc Two;
+endmsc;
Added: trunk/tests/z120_test/z120_test76.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test76.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test76.mpr.result 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,36 @@
+Warning 18: Two or more MSCs have the same name: Two
+Warning 02: There are more unreferenced MSC: Stranka_1, Trick, Two
+OK: z120_test76 is correct, should be correct
+
+mscdocument z120_test76;
+msc Stranka_1;
+initial connect L0;
+L0: reference One connect L1;
+L1: reference Two connect L2;
+L2: final;
+endmsc;
+msc Trick;
+inst NAME;
+inst NAME2;
+NAME: instance;
+out NAME,0 to NAME2;
+endinstance;
+NAME2: instance;
+in NAME,0 from NAME;
+endinstance;
+endmsc;
+msc Two;
+inst Second;
+inst First;
+Second: instance;
+out true,0 to First;
+endinstance;
+First: instance;
+in true,0 from Second;
+endinstance;
+endmsc;
+msc One;
+initial connect L0;
+L0: condition access connect L1;
+L1: final;
+endmsc;
Added: trunk/tests/z120_test/z120_test77.mpr
===================================================================
--- trunk/tests/z120_test/z120_test77.mpr (rev 0)
+++ trunk/tests/z120_test/z120_test77.mpr 2009-10-27 00:44:29 UTC (rev 444)
@@ -0,0 +1,21 @@
+/******************************************************
+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;
+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;
+out a,0 to NAME1;
+in b,1 from NAME1;
+endinstance;
+endmsc;
+
Added: trunk/tests/z120_test/z120_test78.mpr
===================================================================
--- trunk/tests/z120_test/z120_test78.mpr (rev 0)
+++ trunk/tests/z120_test/z...
[truncated message content] |
