|
From: <ma...@us...> - 2009-09-25 08:34:13
|
Revision: 367
http://scstudio.svn.sourceforge.net/scstudio/?rev=367&view=rev
Author: madzin
Date: 2009-09-25 08:33:59 +0000 (Fri, 25 Sep 2009)
Log Message:
-----------
Fix some tests
Modified Paths:
--------------
trunk/src/data/Z120/Z120.g
trunk/tests/z120_test/z120_test52.mpr.result
trunk/tests/z120_test/z120_test54.mpr.result
trunk/tests/z120_test/z120_test63.mpr
Added Paths:
-----------
trunk/tests/z120_test/z120_test63.mpr.result
Modified: trunk/src/data/Z120/Z120.g
===================================================================
--- trunk/src/data/Z120/Z120.g 2009-09-25 08:09:05 UTC (rev 366)
+++ trunk/src/data/Z120/Z120.g 2009-09-25 08:33:59 UTC (rev 367)
@@ -595,11 +595,11 @@
;
input_dest:
- 'lost' //(input_address)? | input_address
+ 'lost' (input_address)? | input_address
;
output_dest:
- 'found' //(output_address)? | output_address
+ 'found' (output_address)? | output_address
;
def_in_gate:
Modified: trunk/tests/z120_test/z120_test52.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test52.mpr.result 2009-09-25 08:09:05 UTC (rev 366)
+++ trunk/tests/z120_test/z120_test52.mpr.result 2009-09-25 08:33:59 UTC (rev 367)
@@ -3,6 +3,6 @@
mscdocument z120_test52;
msc One;
initial connect L0;
-L0: condition access,a connect L1;
+L0: condition access_a connect L1;
L1: final;
endmsc;
Modified: trunk/tests/z120_test/z120_test54.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test54.mpr.result 2009-09-25 08:09:05 UTC (rev 366)
+++ trunk/tests/z120_test/z120_test54.mpr.result 2009-09-25 08:33:59 UTC (rev 367)
@@ -14,8 +14,8 @@
in A,2 from found;
out jedna,0 to B;
concurrent;
+out B1,1 to B;
out B,3 to lost;
-out B1,1 to B;
endconcurrent;
endinstance;
endmsc;
Modified: trunk/tests/z120_test/z120_test63.mpr
===================================================================
--- trunk/tests/z120_test/z120_test63.mpr 2009-09-25 08:09:05 UTC (rev 366)
+++ trunk/tests/z120_test/z120_test63.mpr 2009-09-25 08:33:59 UTC (rev 367)
@@ -1,7 +1,3 @@
-/*****************************************************
-Example of MSC where two instances have the same name (NAME)
-*****************************************************/
-
msc Trick;
inst NAME;
inst NAME;
Added: trunk/tests/z120_test/z120_test63.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test63.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test63.mpr.result 2009-09-25 08:33:59 UTC (rev 367)
@@ -0,0 +1,13 @@
+z120_test63.mpr[4,5] Cannot match to any predicted input.
+Warning 09: There is reference to nonexisted MSC
+
+OK: z120_test63 is correct, should be correct
+
+mscdocument z120_test63;
+msc Stranka_1;
+initial connect L0;
+L0: reference Trick connect L1;
+L1: final;
+endmsc;
+msc Trick;
+endmsc;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|