Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[490] trunk
|
From: <ma...@us...> - 2009-11-25 17:06:58
|
Revision: 490
http://scstudio.svn.sourceforge.net/scstudio/?rev=490&view=rev
Author: madzin
Date: 2009-11-25 17:06:50 +0000 (Wed, 25 Nov 2009)
Log Message:
-----------
Modify error messages
Modified Paths:
--------------
trunk/src/data/Z120/Context.cpp
trunk/tests/z120_test/z120_test31.mpr.result
trunk/tests/z120_test/z120_time22.mpr.result
trunk/tests/z120_test/z120_time23.mpr.result
trunk/tests/z120_test/z120_time24.mpr.result
trunk/tests/z120_test/z120_time25.mpr.result
Modified: trunk/src/data/Z120/Context.cpp
===================================================================
--- trunk/src/data/Z120/Context.cpp 2009-11-25 05:09:11 UTC (rev 489)
+++ trunk/src/data/Z120/Context.cpp 2009-11-25 17:06:50 UTC (rev 490)
@@ -130,7 +130,7 @@
if(context->nonpointed.size() < 1 && context->mscs.size() > 0)
{
- context->z->print_report(RS_ERROR, L"Error 03: Infinite recursion among MSCs");
+ context->z->print_report(RS_WARNING, L"Warning 03: Infinite recursion among MSCs");
}
s_Msc** result = NULL;
@@ -1055,7 +1055,7 @@
{
if(TOWSTRING(context->reference_name) == get_msc_fun(context)->get_label())
{
- context->z->print_report(RS_ERROR, stringize() << L"Error 31: Infinite recursion at " << TOWSTRING(context->element_name) << " node");
+ context->z->print_report(RS_WARNING, stringize() << L"Warning 31: Infinite recursion at node: " << TOWSTRING(context->element_name));
}
std::map<std::string, HMscNodePtr>::iterator it = context->hmsc_nodes.find(context->element_name);
Modified: trunk/tests/z120_test/z120_test31.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test31.mpr.result 2009-11-25 05:09:11 UTC (rev 489)
+++ trunk/tests/z120_test/z120_test31.mpr.result 2009-11-25 17:06:50 UTC (rev 490)
@@ -1,15 +1,14 @@
-Error 31: Infinite recursion at L1 node
-Warning 09: Reference to nonexisting MSC: _out_iha_, bmsc1
+Warning 31: Infinite recursion at node: L1
+Warning 09: Reference to nonexisting MSC: bmsc1
+Warning 03: Infinite recursion among MSCs
OK: z120_test31 is correct, should be correct
mscdocument z120_test31;
msc out_iha;
initial connect L0;
L0: reference bmsc1 connect L1;
-L1: reference _out_iha_ connect L0, L2;
+L1: reference out_iha connect L0, L2;
L2: final;
endmsc;
msc bmsc1;
endmsc;
-msc _out_iha_;
-endmsc;
Modified: trunk/tests/z120_test/z120_time22.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time22.mpr.result 2009-11-25 05:09:11 UTC (rev 489)
+++ trunk/tests/z120_test/z120_time22.mpr.result 2009-11-25 17:06:50 UTC (rev 490)
@@ -1,12 +1,12 @@
-Error 31: Infinite recursion at L0 node
+Warning 31: Infinite recursion at node: L0
Warning 24: Time information to nonexisting reference node: L1
-Warning 09: Reference to nonexisting MSC: _A_
+Warning 03: Infinite recursion among MSCs
OK: z120_time22 is correct, should be correct
mscdocument z120_time22;
msc A;
initial connect L0;
-L0: reference _A_ bottom top L1 [0,inf), top L2 [0,inf);
+L0: reference A bottom top L1 [0,inf), top L2 [0,inf);
connect L2, L3;
L2: reference NAME time [0,inf);
connect L1;
@@ -26,5 +26,3 @@
in NAME,0 from asd;
endinstance;
endmsc;
-msc _A_;
-endmsc;
Modified: trunk/tests/z120_test/z120_time23.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time23.mpr.result 2009-11-25 05:09:11 UTC (rev 489)
+++ trunk/tests/z120_test/z120_time23.mpr.result 2009-11-25 17:06:50 UTC (rev 490)
@@ -1,12 +1,12 @@
-Error 31: Infinite recursion at L0 node
+Warning 31: Infinite recursion at node: L0
Warning 24: Time information to nonexisting reference node: L1
-Warning 09: Reference to nonexisting MSC: _A_
+Warning 03: Infinite recursion among MSCs
OK: z120_time23 is correct, should be correct
mscdocument z120_time23;
msc A;
initial connect L0;
-L0: reference _A_ bottom top L1 [0,inf), top L2 [0,inf);
+L0: reference A bottom top L1 [0,inf), top L2 [0,inf);
connect L2, L3;
L2: reference NAME time [0,inf);
connect L1;
@@ -26,5 +26,3 @@
in NAME,0 from asd;
endinstance;
endmsc;
-msc _A_;
-endmsc;
Modified: trunk/tests/z120_test/z120_time24.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time24.mpr.result 2009-11-25 05:09:11 UTC (rev 489)
+++ trunk/tests/z120_test/z120_time24.mpr.result 2009-11-25 17:06:50 UTC (rev 490)
@@ -1,12 +1,12 @@
-Error 31: Infinite recursion at L0 node
+Warning 31: Infinite recursion at node: L0
Warning 24: Time information to nonexisting reference node: L1, L4
-Warning 09: Reference to nonexisting MSC: _A_
+Warning 03: Infinite recursion among MSCs
OK: z120_time24 is correct, should be correct
mscdocument z120_time24;
msc A;
initial connect L0;
-L0: reference _A_ bottom top L1 [0,inf), top L2 [0,inf);
+L0: reference A bottom top L1 [0,inf), top L2 [0,inf);
connect L2, L3;
L2: reference NAME time [0,inf);
connect L1;
@@ -26,5 +26,3 @@
in NAME,0 from asd;
endinstance;
endmsc;
-msc _A_;
-endmsc;
Modified: trunk/tests/z120_test/z120_time25.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time25.mpr.result 2009-11-25 05:09:11 UTC (rev 489)
+++ trunk/tests/z120_test/z120_time25.mpr.result 2009-11-25 17:06:50 UTC (rev 490)
@@ -1,12 +1,12 @@
-Error 31: Infinite recursion at L0 node
+Warning 31: Infinite recursion at node: L0
Warning 24: Time information to nonexisting reference node: L1, L4
-Warning 09: Reference to nonexisting MSC: _A_
+Warning 03: Infinite recursion among MSCs
OK: z120_time25 is correct, should be correct
mscdocument z120_time25;
msc A;
initial connect L0;
-L0: reference _A_ bottom top L1 [0,inf), top L2 [0,inf);
+L0: reference A bottom top L1 [0,inf), top L2 [0,inf);
connect L2, L3;
L2: reference NAME time [0,inf);
connect L1;
@@ -26,5 +26,3 @@
in NAME,0 from asd;
endinstance;
endmsc;
-msc _A_;
-endmsc;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
