[Olena-patches] scool r128: Fix tests

12 Nov 2008

From: Maxime van Noppen <yabo@lrde.epita.fr>
To: transformers-patches@lrde.epita.fr, olena-patches@lrde.epita.fr
Subject: scool r128: Fix tests

  URL: https://svn.lrde.epita.fr/svn/scool/branches/scool-ng

ChangeLog:
2008-11-12  Maxime van Noppen  <yabo@lrde.epita.fr>

	Fix tests.
	* examples/scool_src/sample_1.scl,
	* examples/scool_src/sample_2.scl,
	* examples/scool_src/sample_3.scl,
	* examples/scool_src/sample_6.scl,
	* examples/scool_src/sample_animal_hierarchy.scl,
	* examples/scool_src/sample_container.scl: Here.

---
 sample_1.scl                |    6 +++---
 sample_2.scl                |    4 ++--
 sample_3.scl                |    6 +++---
 sample_6.scl                |    2 +-
 sample_animal_hierarchy.scl |   22 +++++++++++-----------
 sample_container.scl        |   14 +++++++-------
 6 files changed, 27 insertions(+), 27 deletions(-)

Index: branches/scool-ng/tests/examples/scool_src/sample_animal_hierarchy.scl
===================================================================

--- branches/scool-ng/tests/examples/scool_src/sample_animal_hierarchy.scl	(revision 127)
+++ branches/scool-ng/tests/examples/scool_src/sample_animal_hierarchy.scl	(revision 128)
@@ -2,29 +2,29 @@
 {
   public
   {
-    decl scream : () -> void;
+    scream : () -> void;
+  }
   }
-};
 
-Cat : class < Animal =
+Cat : class where Cat -> Animal =
 {
   public
   {
-    scream : () -> void = { |[ std::cout << "Miaou" << std::endl; ]| }
+    scream : () -> void = { |[ std::cout << "Miaou" << std::endl; ]|; }
+  }
   }
-};
 
-final Dog : class < Animal =
+final Dog : class where Dog -> Animal =
 {
   public
   {
-    scream : () -> void = { |[ std::cout << "Wouf" << std::endl; ]| }
+    scream : () -> void = { |[ std::cout << "Wouf" << std::endl; ]|; }
+  }
   }
-};
 
 scream : (animal : Animal) -> void =
 {
-  |[ animal.scream(); ]|
+  |[ animal.scream(); ]|;
 }
 
 main : () -> int =
@@ -32,8 +32,8 @@
   var cat : Cat;
   var dog : Dog;
 
-  |[ scream(cat); ]|
-  |[ scream(dog); ]|
+  scream(cat);
+  scream(dog);
 
   -> 0;
 }
Index: branches/scool-ng/tests/examples/scool_src/sample_1.scl
===================================================================
--- branches/scool-ng/tests/examples/scool_src/sample_1.scl	(revision 127)
+++ branches/scool-ng/tests/examples/scool_src/sample_1.scl	(revision 128)
@@ -2,8 +2,8 @@
 f : () -> void =
 {
   i : int = 3;
-  i := 4;
+  i = 4;
 
-  var j : int := 3;
-  j := 4;
+  var j : int = 3;
+  j = 4;
 }
Index: branches/scool-ng/tests/examples/scool_src/sample_2.scl
===================================================================
--- branches/scool-ng/tests/examples/scool_src/sample_2.scl	(revision 127)
+++ branches/scool-ng/tests/examples/scool_src/sample_2.scl	(revision 128)
@@ -1,5 +1,5 @@
 f : () -> void =
 {
-  var a : array[int16, 2];
-  var i : int16 := a.at(0);
+  var a : array[int, 2];
+  var i : int = a.at(0);
 }
Index: branches/scool-ng/tests/examples/scool_src/sample_3.scl
===================================================================
--- branches/scool-ng/tests/examples/scool_src/sample_3.scl	(revision 127)
+++ branches/scool-ng/tests/examples/scool_src/sample_3.scl	(revision 128)
@@ -3,7 +3,7 @@
   var i : int;
   var j : int;
 
-  i := 0;
-  j := i;
-  i := j + i;
+  i = 0;
+  j = i;
+  i = j + i;
 }
Index: branches/scool-ng/tests/examples/scool_src/sample_container.scl
===================================================================
--- branches/scool-ng/tests/examples/scool_src/sample_container.scl	(revision 127)
+++ branches/scool-ng/tests/examples/scool_src/sample_container.scl	(revision 128)
@@ -13,14 +13,14 @@
 
     size_type : type;
 
-    decl begin : () -> iterator;
-    decl begin : const () -> const_iterator;
+    begin : () -> iterator;
+    begin : const () -> const_iterator;
 
-    decl end : () -> iterator;
-    decl end : const () -> const_iterator;
+    end : () -> iterator;
+    end : const () -> const_iterator;
 
-    decl size : const () -> size_type;
-    decl empty : const () -> bool;
+    size : const () -> size_type;
+    empty : const () -> bool;
+  }
   }
-};
 
Index: branches/scool-ng/tests/examples/scool_src/sample_6.scl
===================================================================
--- branches/scool-ng/tests/examples/scool_src/sample_6.scl	(revision 127)
+++ branches/scool-ng/tests/examples/scool_src/sample_6.scl	(revision 128)
@@ -1,4 +1,4 @@
 f : () -> void =
 {
-  4 := 4;
+  4 = 4;
 }

    