Changeset 3363 for devel-tools/trunk

Timestamp:

Feb 4, 2008, 11:29:34 PM (13 years ago)

Author:

yura

Message:

• toString method instead of ImageBuilder?.

File:

• devel-tools/trunk/eclipse/org.refal.plus.rfpdt.test/src/org/refal/plus/rfpdt/test/comp/ParserTest.java (modified) (6 diffs)

devel-tools/trunk/eclipse/org.refal.plus.rfpdt.test/src/org/refal/plus/rfpdt/test/comp/ParserTest.java

@@ -69 +69 @@
         interf("$channel A B;", "$public $channel A ; $public $channel B ; ");
 
-        interf("$func F s (e t) = sX (eY tZ);", "$public $func F s ( e t ) = s.X ( e.Y t.Z ) ; ");
-        interf("$func? F s (e t) = sX (eY tZ) ;", "$public $func? F s ( e t ) = s.X ( e.Y t.Z ) ; ");
+        interf("$func F s (e t) = sX (eY tZ);", "$public $func F s ( e t ) = sX ( eY tZ ) ; ");
+        interf("$func? F s (e t) = s.X (e.Y t.Z) ;", "$public $func? F s ( e t ) = s.X ( e.Y t.Z ) ; ");
 
         interf("$module A.B.C;", "$module A.B.C ; ");
@@ -107 +107 @@
 
         implem("$func F s (e t) 123 A \"A b\" ( &B ) = sX (eY tZ);",
-                "$func F s ( e t ) 123 A \"A b\" ( & B ) = s.X ( e.Y t.Z ) ; ");
+                "$func F s ( e t ) 123 A \"A b\" ( & B ) = sX ( eY tZ ) ; ");
         implem("$func? F s = t;", "$func? F s = t ; ");
 
@@ -121 +121 @@
 
         implem("F;", "F : , ; ");
-        implem("F sX;", "F : s.X , ; ");
+        implem("F sX;", "F : sX , ; ");
         implem("F s t e v sX1_ t2X_ eX3_ v_X4 s.X1_ t.2X_ e.X3_ v._X4;",
-                "F : s t e v s.X1_ t.2X_ e.X3_ v._X4 s.X1_ t.2X_ e.X3_ v._X4 , ; ");
+                "F : s t e v sX1_ t2X_ eX3_ v_X4 s.X1_ t.2X_ e.X3_ v._X4 , ; ");
         implem("F $l s;", "F : s , ; ");
         implem("F $r s;", "F : $r s , ; ");
 
         implem("F A;", "F : A , ; ");
-        implem("F s1, s1 : A;", "F : s.1 , s.1 : A , ; ");
+        implem("F s1, s1 : A;", "F : s1 , s1 : A , ; ");
         implem("F {A; B;};", "F { : A , ; : B , ; } ; ");
         implem("F {};", "F { } ; ");
@@ -136 +136 @@
 
         implem("F = sX1_ t2X_ eX3_ v_X4 s.X1_ t.2X_ e.X3_ v._X4;",
-                "F : = , s.X1_ t.2X_ e.X3_ v._X4 s.X1_ t.2X_ e.X3_ v._X4 ; ");
-        implem("F = sX <F (e2) A>;", "F : = , s.X < F ( e.2 ) A > ; ");
+                "F : = , sX1_ t2X_ eX3_ v_X4 s.X1_ t.2X_ e.X3_ v._X4 ; ");
+        implem("F = sX <F (e2) A>;", "F : = , sX < F ( e2 ) A > ; ");
 
-        implem("F , eX;", "F : , e.X ; ");
+        implem("F , eX;", "F : , eX ; ");
         implem("F , A:: ;", "F : , A :: , ; ");
         implem("F , A::s, B;", "F : , A :: s , B ; ");
@@ -146 +146 @@
         implem("F , A $iter B :: s;", "F : , A $iter , B :: s , ; ");
         implem("F , A $iter B :: s,;", "F : , A $iter , B :: s , ; ");
-        implem("F , A : sX;", "F : , A : s.X , ; ");
-        implem("F , A : sX,;", "F : , A : s.X , ; ");
+        implem("F , A : sX;", "F : , A : sX , ; ");
+        implem("F , A : sX,;", "F : , A : sX , ; ");
 
         implem("F , , A;", "F : , :: , A ; ");
@@ -169 +169 @@
                 "F : , :: # , A { : A , 1 ; : B , 2 ; } { : A , 1 ; : B , 2 ; } :: , ; ");
         implem("F , A : {A,1;B,2;} : {A,1;B,2;} :: sX, sX;",
-                "F : , A { : A , 1 ; : B , 2 ; } { : A , 1 ; : B , 2 ; } :: s.X , s.X ; ");
+                "F : , A { : A , 1 ; : B , 2 ; } { : A , 1 ; : B , 2 ; } :: sX , sX ; ");
         implem("F , A : {$fail;A;} : {A,1;B,2;} :: sX, sX;",
-                "F : , A { : $fail ; : A , ; } { : A , 1 ; : B , 2 ; } :: s.X , s.X ; ");
+                "F : , A { : $fail ; : A , ; } { : A , 1 ; : B , 2 ; } :: sX , sX ; ");
 
         implem("F { {}; };", "F { { } ; } ; ");
-        implem("F { { A = B; } :: sX; };", "F { { : A = , B ; } :: s.X , ; } ; ");
+        implem("F { { A = B; } :: sX; };", "F { { : A = , B ; } :: sX , ; } ; ");
 
         implem("F A,A;", "F : A , A ; ");