[Scstudio-commits] SF.net SVN: scstudio:[454] trunk

[<ma...@us...>]

Revision: 454
          http://scstudio.svn.sourceforge.net/scstudio/?rev=454&view=rev
Author:   madzin
Date:     2009-11-09 00:36:04 +0000 (Mon, 09 Nov 2009)

Log Message:
-----------
Fix of one error message

Modified Paths:
--------------
    trunk/src/data/Z120/Context.cpp
    trunk/tests/z120_test/z120_test42.mpr.result
    trunk/tests/z120_test/z120_test56.mpr.result

Added Paths:
-----------
    trunk/tests/z120_test/z120_test86.mpr.result

Modified: trunk/src/data/Z120/Context.cpp
===================================================================
--- trunk/src/data/Z120/Context.cpp	2009-11-04 21:33:49 UTC (rev 453)
+++ trunk/src/data/Z120/Context.cpp	2009-11-09 00:36:04 UTC (rev 454)
@@ -749,8 +749,9 @@
   std::map<std::string, EventPtr>::iterator named_event_it;
   CoregionEventPtr event = boost::dynamic_pointer_cast<CoregionEvent>(context->current_event);
   if(event == NULL){
-    context->z->print_report(RS_ERROR, L"Internal Error 13: Typecast failed\n");
-    exit(13);
+    context->z->print_report(RS_WARNING, stringize() << L"Warning 13: Event of " << context->current_event->get_message()->get_label() << " message is not in coregion");
+
+    return;
   }
   for(it = context->order_events.begin(); it != context->order_events.end(); ++it){
     if((named_event_it = context->named_events.find(*it)) != context->named_events.end()){

Modified: trunk/tests/z120_test/z120_test42.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test42.mpr.result	2009-11-04 21:33:49 UTC (rev 453)
+++ trunk/tests/z120_test/z120_test42.mpr.result	2009-11-09 00:36:04 UTC (rev 454)
@@ -1,7 +1,12 @@
 z120_test42.mpr[11,0] Cannot match to any predicted input.
+z120_test42.mpr[11,0] Cannot match to any predicted input.
+z120_test42.mpr[11,13] Cannot match to any predicted input.
+Warning 05: Complete message (no,0) with only one event
+Warning 05: Complete message (ok,1) with only one event
 z120_test42.mpr[30,0] Cannot match to any predicted input.
-Warning 09: There is reference to nonexisted MSC
-
+z120_test42.mpr[30,0] Cannot match to any predicted input.
+Warning 05: Complete message (yes,0) with only one event
+Warning 02: Unreferenced MSC: Strnka1, bmsc3
 OK: z120_test42 is correct, should be correct
 
 mscdocument z120_test42;
@@ -10,6 +15,19 @@
 L0: reference bmsc1 connect L1;
 L1: final;
 endmsc;
+msc bmsc3;
+inst B;
+B: instance;
+out no,0 to lost;
+in ok,1 from found;
+endinstance;
+endmsc;
+msc bmsc1;
+inst B;
+B: instance;
+in yes,0 from found;
+endinstance;
+endmsc;
 msc bmsc2;
 inst A;
 inst B;
@@ -20,5 +38,3 @@
 out no,0 to A;
 endinstance;
 endmsc;
-msc bmsc1;
-endmsc;

Modified: trunk/tests/z120_test/z120_test56.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test56.mpr.result	2009-11-04 21:33:49 UTC (rev 453)
+++ trunk/tests/z120_test/z120_test56.mpr.result	2009-11-09 00:36:04 UTC (rev 454)
@@ -1,7 +1,8 @@
 z120_test56.mpr[11,0] Cannot match to any predicted input.
-Warning 05: There is complete message with only one event
-Warning 09: There is reference to nonexisted MSC
-
+z120_test56.mpr[11,0] Cannot match to any predicted input.
+z120_test56.mpr[11,13] Cannot match to any predicted input.
+Warning 05: Complete message (no,0) with only one event
+Warning 05: Complete message (ok,1) with only one event
 OK: z120_test56 is correct, should be correct
 
 mscdocument z120_test56;

Added: trunk/tests/z120_test/z120_test86.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test86.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_test86.mpr.result	2009-11-09 00:36:04 UTC (rev 454)
@@ -0,0 +1,26 @@
+Warning 13: Event of a message is not in coregion
+Warning 06: Dependency on nonexisting event
+
+Warning 07: Reference to nonexisting event
+
+OK: z120_test86 is correct, should be correct
+
+mscdocument z120_test86;
+msc Stranka1;
+inst NAME1;
+inst NAME2;
+NAME1: instance;
+concurrent;
+label e0;
+;
+in a,0 from NAME2;
+in a,1 from found before e1;
+label e1;
+out b,2 to NAME2 before e0;
+endconcurrent;
+endinstance;
+NAME2: instance;
+out a,0 to NAME1;
+in b,2 from NAME1;
+endinstance;
+endmsc;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.