fix all the cases, much white noise, array to list, string to sym stuff

test/cases/basic/module_name.tst

@@ -1,3 +1,4 @@
 FooBar 
 -- -- --
-s(:list,  [s(:module,  "FooBar")])
+s(:expressions, 
+  s(:module,  "FooBar"))

test/cases/basic/name.tst

@@ -1,3 +1,4 @@
 foo 
 -- -- --
-s(:list,  [s(:name,  "foo")])
+s(:expressions, 
+  s(:name,  :foo))

test/cases/basic/name_underscode_middle.tst

@@ -1,3 +1,4 @@
 foo_bar 
 -- -- --
-s(:list,  [s(:name,  "foo_bar")])
+s(:expressions, 
+  s(:name,  :foo_bar))

test/cases/basic/name_underscode_start.tst

@@ -1,3 +1,4 @@
 _bar 
 -- -- --
-s(:list,  [s(:name,  "_bar")])
+s(:expressions, 
+  s(:name,  :_bar))

test/cases/basic/number.tst

@@ -1,3 +1,4 @@
 42 
 -- -- --
-s(:list,  [s(:int,  42)])
+s(:expressions, 
+  s(:int,  42))

test/cases/basic/string.tst

@@ -1,3 +1,4 @@
 "hello"
 -- -- --
-s(:list,  [s(:string,  "hello")])
+s(:expressions, 
+  s(:string,  "hello"))

test/cases/basic/string_escapes.tst

@@ -1,3 +1,4 @@
 "hello  \nyou"
 -- -- --
-s(:list,  [s(:string,  "hello  \\nyou")])
+s(:expressions, 
+  s(:string,  "hello  \\nyou"))

test/cases/call_site/call_puts_two.tst

@@ -1,7 +1,8 @@
 puts(3  , a )
 -- -- --
-s(:list,  [s(:call, 
+s(:expressions, 
-  s(:name,  "puts"), 
+  s(:call, 
+    s(:name,  :puts), 
     s(:arguments, 
       s(:int,  3), 
-    s(:name,  "a")))])
+      s(:name,  :a))))

test/cases/call_site/call_site_multi.tst

@@ -1,7 +1,8 @@
 baz(42, foo)
 -- -- --
-s(:list,  [s(:call, 
+s(:expressions, 
-  s(:name,  "baz"), 
+  s(:call, 
+    s(:name,  :baz), 
     s(:arguments, 
       s(:int,  42), 
-    s(:name,  "foo")))])
+      s(:name,  :foo))))

test/cases/call_site/call_site_string.tst

@@ -1,6 +1,7 @@
 puts( "hello")
 -- -- --
-s(:list,  [s(:call, 
+s(:expressions, 
-  s(:name,  "puts"), 
+  s(:call, 
+    s(:name,  :puts), 
     s(:arguments, 
-    s(:string,  "hello")))])
+      s(:string,  "hello"))))

test/cases/call_site/int_receiver.tst

@@ -1,7 +1,8 @@
 42.put()
 -- -- --
-s(:list,  [s(:call, 
+s(:expressions, 
-  s(:name,  "put"), 
+  s(:call, 
+    s(:name,  :put), 
     s(:arguments), 
     s(:receiver, 
-    s(:int,  42)))])
+      s(:int,  42))))

test/cases/call_site/puts_call.tst

@@ -1,6 +1,7 @@
 puts( 5)
 -- -- --
-s(:list,  [s(:call, 
+s(:expressions, 
-  s(:name,  "puts"), 
+  s(:call, 
+    s(:name,  :puts), 
     s(:arguments, 
-    s(:int,  5)))])
+      s(:int,  5))))

test/cases/call_site/single_argument.tst

@@ -1,6 +1,7 @@
 foo(42)
 -- -- --
-s(:list,  [s(:call, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:call, 
+    s(:name,  :foo), 
     s(:arguments, 
-    s(:int,  42)))])
+      s(:int,  42))))

test/cases/call_site/single_class.tst

@@ -1,8 +1,9 @@
 Object.foo(42)
 -- -- --
-s(:list,  [s(:call, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:call, 
+    s(:name,  :foo), 
     s(:arguments, 
       s(:int,  42)), 
     s(:receiver, 
-    s(:module,  "Object")))])
+      s(:module,  "Object"))))

test/cases/call_site/single_name.tst

@@ -1,8 +1,9 @@
 my_my.foo(42)
 -- -- --
-s(:list,  [s(:call, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:call, 
+    s(:name,  :foo), 
     s(:arguments, 
       s(:int,  42)), 
     s(:receiver, 
-    s(:name,  "my_my")))])
+      s(:name,  :my_my))))

test/cases/call_site/single_self.tst

@@ -1,8 +1,9 @@
 self.foo(42)
 -- -- --
-s(:list,  [s(:call, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:call, 
+    s(:name,  :foo), 
     s(:arguments, 
       s(:int,  42)), 
     s(:receiver, 
-    s(:name,  "self")))])
+      s(:name,  :self))))

test/cases/call_site/string_receiver.tst

@@ -1,7 +1,8 @@
 "hello".puts()
 -- -- --
-s(:list,  [s(:call, 
+s(:expressions, 
-  s(:name,  "puts"), 
+  s(:call, 
+    s(:name,  :puts), 
     s(:arguments), 
     s(:receiver, 
-    s(:string,  "hello")))])
+      s(:string,  "hello"))))

test/cases/class_def/class_derived.tst

@@ -2,9 +2,11 @@ class Foo < Object
   ofthen(3 , var)
 end
 -- -- --
-s(:list,  [s(:class,  "Foo", 
+s(:expressions, 
-  s(:module,  "Object"),  [s(:call, 
+  s(:class,  :Foo, 
-  s(:name,  "ofthen"), 
+    s(:derives,  :Object), 
+    s(:call, 
+      s(:name,  :ofthen), 
       s(:arguments, 
         s(:int,  3), 
-    s(:name,  "var")))])])
+        s(:name,  :var)))))

test/cases/class_def/class_function.tst

@@ -5,14 +5,18 @@ class Pifi
   end
 end
 -- -- --
-s(:list,  [s(:class,  "Pifi",  nil,  [s(:call, 
+s(:expressions, 
-  s(:name,  "ofthen"), 
+  s(:class,  :Pifi, 
+    s(:derives,  nil), 
+    s(:call, 
+      s(:name,  :ofthen), 
       s(:arguments, 
         s(:int,  3), 
-    s(:name,  "var"))), s(:function,  :int, 
+        s(:name,  :var))), 
-  s(:name,  "ofthen"), 
+    s(:function,  :int, 
+      s(:name,  :ofthen), 
       s(:parameters, 
         s(:field,  :int,  :n), 
         s(:field,  :ref,  :m)), 
       s(:expressions, 
-    s(:int,  44)))])])
+        s(:int,  44)))))

test/cases/class_def/class_if.tst

@@ -8,8 +8,11 @@ class Ifi
   end
 end
 -- -- --
-s(:list,  [s(:class,  "Ifi",  nil,  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "ofthen"), 
+  s(:class,  :Ifi, 
+    s(:derives,  nil), 
+    s(:function,  :int, 
+      s(:name,  :ofthen), 
       s(:parameters, 
         s(:field,  :int,  :n)), 
       s(:expressions, 
@@ -18,8 +21,8 @@ s(:list,  [s(:class,  "Ifi",  nil,  [s(:function,  :int,
             s(:int,  0)), 
           s(:if_true, 
             s(:assign, 
-          s(:name,  "isit"), 
+              s(:name,  :isit), 
               s(:int,  42))), 
           s(:if_false,  [s(:assign, 
-  s(:name,  "maybenot"), 
+  s(:name,  :maybenot), 
-  s(:int,  667))]))))])])
+  s(:int,  667))]))))))

test/cases/class_def/class_method.tst

@@ -1,7 +1,14 @@
 class Foo < Object
-  int Foo.test()
+  int test()
     43
   end
 end
 -- -- --
-{:expression_list=>[{:module_name=>"Foo", :derived_name=>s(:module,  "Object"), :class_expressions=>[{:type=>"int", :receiver=>s(:module,  "Foo"), :function_name=>s(:name,  "test"), :parameter_list=>[], :expressions=>[s(:int,  43)], :end=>"end"}], :end=>"end"}]}
+s(:expressions,
+  s(:class,  :Foo,
+    s(:derives,  :Object),
+    s(:function,  :int,
+      s(:name,  :test),
+      s(:parameters),
+      s(:expressions,
+        s(:int,  43)))))

test/cases/class_def/class_module.tst

@@ -4,8 +4,12 @@ class Foo
   end
 end
 -- -- --
-s(:list,  [s(:class,  "Foo",  nil,  [s(:module,  "Boo",  [s(:call, 
+s(:expressions, 
-  s(:name,  "funcall"), 
+  s(:class,  :Foo, 
+    s(:derives,  nil), 
+    s(:module,  :Boo, 
+      s(:call, 
+        s(:name,  :funcall), 
         s(:arguments, 
           s(:int,  3), 
-    s(:name,  "var")))])])])
+          s(:name,  :var))))))

test/cases/class_def/class_ops.tst

@@ -5,15 +5,18 @@ class Opers
   end
 end
 -- -- --
-s(:list,  [s(:class,  "Opers",  nil,  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:class,  :Opers, 
+    s(:derives,  nil), 
+    s(:function,  :int, 
+      s(:name,  :foo), 
       s(:parameters, 
         s(:field,  :int,  :x)), 
       s(:expressions, 
-    s(:name,  "int"), 
+        s(:name,  :int), 
         s(:assign, 
-      s(:name,  "abba"), 
+          s(:name,  :abba), 
           s(:int,  5)), 
         s(:operator,  "+", 
-      s(:name,  "abba"), 
+          s(:name,  :abba), 
-      s(:int,  5))))])])
+          s(:int,  5))))))

test/cases/class_def/simplest_class.tst

@@ -2,4 +2,7 @@ class Foo
   5
 end
 -- -- --
-s(:list,  [s(:class,  "Foo",  nil,  [s(:int,  5)])])
+s(:expressions, 
+  s(:class,  :Foo, 
+    s(:derives,  nil), 
+    s(:int,  5)))

test/cases/compound/array_list.tst

@@ -1,3 +1,6 @@
 [42, foo]
 -- -- --
-s(:list,  [s(:array,  [s(:int,  42), s(:name,  "foo")])])
+s(:expressions, 
+  s(:array, 
+    s(:int,  42), 
+    s(:name,  :foo)))

test/cases/compound/array_ops.tst

@@ -1,8 +1,11 @@
 [ 3 + 4 , foo(22) ]
 -- -- --
-s(:list,  [s(:array,  [s(:operator,  "+", 
+s(:expressions, 
+  s(:array, 
+    s(:operator,  "+", 
       s(:int,  3), 
-  s(:int,  4)), s(:call, 
+      s(:int,  4)), 
-  s(:name,  "foo"), 
+    s(:call, 
+      s(:name,  :foo), 
       s(:arguments, 
-    s(:int,  22)))])])
+        s(:int,  22)))))

test/cases/compound/hash.tst

@@ -1,5 +1,7 @@
 { foo => 33 }
 -- -- --
-s(:list,  [s(:hash,  [s(:assoc, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:hash, 
-  s(:int,  33))])])
+    s(:assoc, 
+      s(:name,  :foo), 
+      s(:int,  33))))

test/cases/compound/hash2.tst

@@ -1,5 +1,7 @@
 { foo => true }
 -- -- --
-s(:list,  [s(:hash,  [s(:assoc, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:hash, 
-  s(:true))])])
+    s(:assoc, 
+      s(:name,  :foo), 
+      s(:true))))

test/cases/compound/hash_list.tst

@@ -1,7 +1,10 @@
 {foo => 33 , bar => 42}
 -- -- --
-s(:list,  [s(:hash,  [s(:assoc, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:hash, 
-  s(:int,  33)), s(:assoc, 
+    s(:assoc, 
-  s(:name,  "bar"), 
+      s(:name,  :foo), 
-  s(:int,  42))])])
+      s(:int,  33)), 
+    s(:assoc, 
+      s(:name,  :bar), 
+      s(:int,  42))))

test/cases/compound/one_array.tst

@@ -1,3 +1,5 @@
 [42]
 -- -- --
-s(:list,  [s(:array,  [s(:int,  42)])])
+s(:expressions, 
+  s(:array, 
+    s(:int,  42)))

test/cases/conditional/if_else.tst

@@ -4,9 +4,10 @@ else
   667
 end
 -- -- --
-s(:list,  [s(:if, 
+s(:expressions, 
+  s(:if, 
     s(:condition, 
       s(:int,  0)), 
     s(:if_true, 
       s(:int,  42)), 
-  s(:if_false,  [s(:int,  667)]))])
+    s(:if_false,  [s(:int,  667)])))

test/cases/conditional/if_else_expressions.tst

@@ -4,21 +4,22 @@ else
   var.new(33)
 end
 -- -- --
-s(:list,  [s(:if, 
+s(:expressions, 
+  s(:if, 
     s(:condition, 
       s(:operator,  ">", 
         s(:int,  3), 
-      s(:name,  "var"))), 
+        s(:name,  :var))), 
     s(:if_true, 
       s(:call, 
-      s(:name,  "initialize"), 
+        s(:name,  :initialize), 
         s(:arguments, 
           s(:int,  3)), 
         s(:receiver, 
           s(:module,  "Object")))), 
     s(:if_false,  [s(:call, 
-  s(:name,  "new"), 
+  s(:name,  :new), 
   s(:arguments, 
     s(:int,  33)), 
   s(:receiver, 
-    s(:name,  "var")))]))])
+    s(:name,  :var)))])))

test/cases/conditional/if_end.tst

@@ -2,9 +2,10 @@ if(0)
   42
 end
 -- -- --
-s(:list,  [s(:if, 
+s(:expressions, 
+  s(:if, 
     s(:condition, 
       s(:int,  0)), 
     s(:if_true, 
       s(:int,  42)), 
-  s(:if_false,  nil))])
+    s(:if_false,  nil)))

test/cases/conditional/if_end_expressions.tst

@@ -2,16 +2,17 @@ if(3 > var)
   Object.initialize(3)
 end
 -- -- --
-s(:list,  [s(:if, 
+s(:expressions, 
+  s(:if, 
     s(:condition, 
       s(:operator,  ">", 
         s(:int,  3), 
-      s(:name,  "var"))), 
+        s(:name,  :var))), 
     s(:if_true, 
       s(:call, 
-      s(:name,  "initialize"), 
+        s(:name,  :initialize), 
         s(:arguments, 
           s(:int,  3)), 
         s(:receiver, 
           s(:module,  "Object")))), 
-  s(:if_false,  nil))])
+    s(:if_false,  nil)))

test/cases/expressions/assignment.tst

@@ -1,5 +1,6 @@
 a = 5
 -- -- --
-s(:list,  [s(:assign, 
+s(:expressions, 
-  s(:name,  "a"), 
+  s(:assign, 
-  s(:int,  5))])
+    s(:name,  :a), 
+    s(:int,  5)))

test/cases/expressions/assignment_instance.tst

@@ -1,5 +1,6 @@
 a = 5
 -- -- --
-s(:list,  [s(:assign, 
+s(:expressions, 
-  s(:name,  "a"), 
+  s(:assign, 
-  s(:int,  5))])
+    s(:name,  :a), 
+    s(:int,  5)))

test/cases/expressions/op_two_variable.tst

@@ -1,5 +1,6 @@
 a - b
 -- -- --
-s(:list,  [s(:operator,  "-", 
+s(:expressions, 
-  s(:name,  "a"), 
+  s(:operator,  "-", 
-  s(:name,  "b"))])
+    s(:name,  :a), 
+    s(:name,  :b)))

test/cases/expressions/op_variable.tst

@@ -1,5 +1,6 @@
 a - 5
 -- -- --
-s(:list,  [s(:operator,  "-", 
+s(:expressions, 
-  s(:name,  "a"), 
+  s(:operator,  "-", 
-  s(:int,  5))])
+    s(:name,  :a), 
+    s(:int,  5)))

test/cases/expressions/op_variable_string.tst

@@ -1,5 +1,6 @@
 a - "st"
 -- -- --
-s(:list,  [s(:operator,  "-", 
+s(:expressions, 
-  s(:name,  "a"), 
+  s(:operator,  "-", 
-  s(:string,  "st"))])
+    s(:name,  :a), 
+    s(:string,  "st")))

test/cases/expressions/op_variable_true.tst

@@ -1,5 +1,6 @@
 a == true
 -- -- --
-s(:list,  [s(:operator,  "==", 
+s(:expressions, 
-  s(:name,  "a"), 
+  s(:operator,  "==", 
-  s(:true))])
+    s(:name,  :a), 
+    s(:true)))

test/cases/expressions/simple_devide.tst

@@ -1,5 +1,6 @@
 5 / 3
 -- -- --
-s(:list,  [s(:operator,  "/", 
+s(:expressions, 
+  s(:operator,  "/", 
     s(:int,  5), 
-  s(:int,  3))])
+    s(:int,  3)))

test/cases/expressions/simple_greater.tst

@@ -1,5 +1,6 @@
 5 > 3
 -- -- --
-s(:list,  [s(:operator,  ">", 
+s(:expressions, 
+  s(:operator,  ">", 
     s(:int,  5), 
-  s(:int,  3))])
+    s(:int,  3)))

test/cases/expressions/simple_minus.tst

@@ -1,5 +1,6 @@
 5 - 3
 -- -- --
-s(:list,  [s(:operator,  "-", 
+s(:expressions, 
+  s(:operator,  "-", 
     s(:int,  5), 
-  s(:int,  3))])
+    s(:int,  3)))

test/cases/expressions/simple_multiply.tst

@@ -1,5 +1,6 @@
 5 * 3
 -- -- --
-s(:list,  [s(:operator,  "*", 
+s(:expressions, 
+  s(:operator,  "*", 
     s(:int,  5), 
-  s(:int,  3))])
+    s(:int,  3)))

test/cases/expressions/simple_plus.tst

@@ -1,5 +1,6 @@
 5 + 3
 -- -- --
-s(:list,  [s(:operator,  "+", 
+s(:expressions, 
+  s(:operator,  "+", 
     s(:int,  5), 
-  s(:int,  3))])
+    s(:int,  3)))

test/cases/expressions/simple_smaller.tst

@@ -1,5 +1,6 @@
 5 < 3
 -- -- --
-s(:list,  [s(:operator,  "<", 
+s(:expressions, 
+  s(:operator,  "<", 
     s(:int,  5), 
-  s(:int,  3))])
+    s(:int,  3)))

test/cases/expressions/two_different_ops.tst

@@ -1,7 +1,8 @@
 2 + 3 * 4
 -- -- --
-s(:list,  [s(:operator,  "+", 
+s(:expressions, 
+  s(:operator,  "+", 
     s(:int,  2), 
     s(:operator,  "*", 
       s(:int,  3), 
-    s(:int,  4)))])
+      s(:int,  4))))

test/cases/expressions/two_different_ops_order.tst

@@ -1,7 +1,8 @@
 2 * 3 + 4
 -- -- --
-s(:list,  [s(:operator,  "+", 
+s(:expressions, 
+  s(:operator,  "+", 
     s(:operator,  "*", 
       s(:int,  2), 
       s(:int,  3)), 
-  s(:int,  4))])
+    s(:int,  4)))

test/cases/expressions/two_same_ops.tst

@@ -1,7 +1,8 @@
 2 + 3 + 4
 -- -- --
-s(:list,  [s(:operator,  "+", 
+s(:expressions, 
+  s(:operator,  "+", 
     s(:operator,  "+", 
       s(:int,  2), 
       s(:int,  3)), 
-  s(:int,  4))])
+    s(:int,  4)))

test/cases/function_definition/class_function.tst

@@ -1,5 +1,11 @@
-int  String.length( ref x )
+int length( ref x )
   length
 end
 -- -- --
-{:expression_list=>[{:type=>"int", :receiver=>s(:module,  "String"), :function_name=>s(:name,  "length"), :parameter_list=>[s(:field,  :ref,  :x)], :expressions=>[s(:name,  "length")], :end=>"end"}]}
+s(:expressions, 
+  s(:function,  :int, 
+    s(:name,  :length), 
+    s(:parameters, 
+      s(:field,  :ref,  :x)), 
+    s(:expressions, 
+      s(:name,  :length))))

test/cases/function_definition/function_big_while.tst

@@ -10,40 +10,41 @@ int fibonaccit(int n)
   end
 end
 -- -- --
-s(:list,  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "fibonaccit"), 
+  s(:function,  :int, 
+    s(:name,  :fibonaccit), 
     s(:parameters, 
       s(:field,  :int,  :n)), 
     s(:expressions, 
       s(:assign, 
-      s(:name,  "a"), 
+        s(:name,  :a), 
         s(:int,  0)), 
       s(:assign, 
-      s(:name,  "b"), 
+        s(:name,  :b), 
         s(:int,  1)), 
       s(:while, 
         s(:condition, 
           s(:operator,  ">", 
-          s(:name,  "n"), 
+            s(:name,  :n), 
             s(:int,  1))), 
         s(:expressions, 
           s(:assign, 
-          s(:name,  "tmp"), 
+            s(:name,  :tmp), 
-          s(:name,  "a")), 
+            s(:name,  :a)), 
           s(:assign, 
-          s(:name,  "a"), 
+            s(:name,  :a), 
-          s(:name,  "b")), 
+            s(:name,  :b)), 
           s(:assign, 
-          s(:name,  "b"), 
+            s(:name,  :b), 
             s(:operator,  "+", 
-            s(:name,  "tmp"), 
+              s(:name,  :tmp), 
-            s(:name,  "b"))), 
+              s(:name,  :b))), 
           s(:call, 
-          s(:name,  "puts"), 
+            s(:name,  :puts), 
             s(:arguments, 
-            s(:name,  "b"))), 
+              s(:name,  :b))), 
           s(:assign, 
-          s(:name,  "n"), 
+            s(:name,  :n), 
             s(:operator,  "-", 
-            s(:name,  "n"), 
+              s(:name,  :n), 
-            s(:int,  1)))))))])
+              s(:int,  1))))))))

test/cases/function_definition/function_if.tst

@@ -6,8 +6,9 @@ ref ofthen(int n)
   end
 end
 -- -- --
-s(:list,  [s(:function,  :ref, 
+s(:expressions, 
-  s(:name,  "ofthen"), 
+  s(:function,  :ref, 
+    s(:name,  :ofthen), 
     s(:parameters, 
       s(:field,  :int,  :n)), 
     s(:expressions, 
@@ -16,8 +17,8 @@ s(:list,  [s(:function,  :ref,
           s(:int,  0)), 
         s(:if_true, 
           s(:assign, 
-          s(:name,  "isit"), 
+            s(:name,  :isit), 
             s(:int,  42))), 
         s(:if_false,  [s(:assign, 
-  s(:name,  "maybenot"), 
+  s(:name,  :maybenot), 
-  s(:int,  667))]))))])
+  s(:int,  667))])))))

test/cases/function_definition/function_no_arg.tst

@@ -2,8 +2,9 @@ int foo()
   5
 end
 -- -- --
-s(:list,  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:function,  :int, 
+    s(:name,  :foo), 
     s(:parameters), 
     s(:expressions, 
-    s(:int,  5)))])
+      s(:int,  5))))

test/cases/function_definition/function_ops.tst

@@ -3,15 +3,16 @@ int foo(int x)
  abba + 5
 end
 -- -- --
-s(:list,  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:function,  :int, 
+    s(:name,  :foo), 
     s(:parameters, 
       s(:field,  :int,  :x)), 
     s(:expressions, 
-    s(:name,  "int"), 
+      s(:name,  :int), 
       s(:assign, 
-      s(:name,  "abba"), 
+        s(:name,  :abba), 
         s(:int,  5)), 
       s(:operator,  "+", 
-      s(:name,  "abba"), 
+        s(:name,  :abba), 
-      s(:int,  5))))])
+        s(:int,  5)))))

test/cases/function_definition/function_return.tst

@@ -3,14 +3,15 @@ int retvar(ref n)
   return i
 end
 -- -- --
-s(:list,  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "retvar"), 
+  s(:function,  :int, 
+    s(:name,  :retvar), 
     s(:parameters, 
       s(:field,  :ref,  :n)), 
     s(:expressions, 
-    s(:name,  "int"), 
+      s(:name,  :int), 
       s(:assign, 
-      s(:name,  "i"), 
+        s(:name,  :i), 
         s(:int,  5)), 
       s(:return, 
-      s(:name,  "i"))))])
+        s(:name,  :i)))))

test/cases/function_definition/function_return_if.tst

@@ -6,18 +6,19 @@ int retvar(int n)
   end
 end
 -- -- --
-s(:list,  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "retvar"), 
+  s(:function,  :int, 
+    s(:name,  :retvar), 
     s(:parameters, 
       s(:field,  :int,  :n)), 
     s(:expressions, 
       s(:if, 
         s(:condition, 
           s(:operator,  ">", 
-          s(:name,  "n"), 
+            s(:name,  :n), 
             s(:int,  5))), 
         s(:if_true, 
           s(:return, 
             s(:int,  10))), 
         s(:if_false,  [s(:return, 
-  s(:int,  20))]))))])
+  s(:int,  20))])))))

test/cases/function_definition/function_return_while.tst

@@ -5,21 +5,22 @@ int retvar(int n )
   end
 end
 -- -- --
-s(:list,  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "retvar"), 
+  s(:function,  :int, 
+    s(:name,  :retvar), 
     s(:parameters, 
       s(:field,  :int,  :n)), 
     s(:expressions, 
       s(:while, 
         s(:condition, 
           s(:operator,  ">", 
-          s(:name,  "n"), 
+            s(:name,  :n), 
             s(:int,  5))), 
         s(:expressions, 
           s(:assign, 
-          s(:name,  "n"), 
+            s(:name,  :n), 
             s(:operator,  "+", 
-            s(:name,  "n"), 
+              s(:name,  :n), 
               s(:int,  1))), 
           s(:return, 
-          s(:name,  "n"))))))])
+            s(:name,  :n)))))))

test/cases/function_definition/function_two_args.tst

@@ -2,10 +2,11 @@ int foo( int n ,ref  m)
   n
 end
 -- -- --
-s(:list,  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:function,  :int, 
+    s(:name,  :foo), 
     s(:parameters, 
       s(:field,  :int,  :n), 
       s(:field,  :ref,  :m)), 
     s(:expressions, 
-    s(:name,  "n")))])
+      s(:name,  :n))))

test/cases/function_definition/function_while.tst

@@ -6,23 +6,24 @@ ref fibonaccit(int n)
   end
 end
 -- -- --
-s(:list,  [s(:function,  :ref, 
+s(:expressions, 
-  s(:name,  "fibonaccit"), 
+  s(:function,  :ref, 
+    s(:name,  :fibonaccit), 
     s(:parameters, 
       s(:field,  :int,  :n)), 
     s(:expressions, 
       s(:assign, 
-      s(:name,  "a"), 
+        s(:name,  :a), 
         s(:int,  0)), 
       s(:while, 
         s(:condition, 
-        s(:name,  "n")), 
+          s(:name,  :n)), 
         s(:expressions, 
           s(:assign, 
-          s(:name,  "some"), 
+            s(:name,  :some), 
             s(:int,  43)), 
           s(:assign, 
-          s(:name,  "other"), 
+            s(:name,  :other), 
             s(:operator,  "*", 
-            s(:name,  "some"), 
+              s(:name,  :some), 
-            s(:int,  4)))))))])
+              s(:int,  4))))))))

test/cases/function_definition/simplest_function.tst

@@ -2,9 +2,10 @@ int foo(ref x)
   5
 end
 -- -- --
-s(:list,  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:function,  :int, 
+    s(:name,  :foo), 
     s(:parameters, 
       s(:field,  :ref,  :x)), 
     s(:expressions, 
-    s(:int,  5)))])
+      s(:int,  5))))

test/cases/module_def/module_assign_var.tst

@@ -2,6 +2,8 @@ module Opers
   abba = 5
 end
 -- -- --
-s(:list,  [s(:module,  "Opers",  [s(:assign, 
+s(:expressions, 
-  s(:name,  "abba"), 
+  s(:module,  :Opers, 
-  s(:int,  5))])])
+    s(:assign, 
+      s(:name,  :abba), 
+      s(:int,  5))))

test/cases/module_def/module_class.tst

@@ -4,8 +4,12 @@ module Foo
   end
 end
 -- -- --
-s(:list,  [s(:module,  "Foo",  [s(:class,  "Bar",  nil,  [s(:call, 
+s(:expressions, 
-  s(:name,  "funcall"), 
+  s(:module,  :Foo, 
+    s(:class,  :Bar, 
+      s(:derives,  nil), 
+      s(:call, 
+        s(:name,  :funcall), 
         s(:arguments, 
           s(:int,  3), 
-    s(:name,  "var")))])])])
+          s(:name,  :var))))))

test/cases/module_def/module_function.tst

@@ -5,15 +5,18 @@ module Soho
   end
 end
 -- -- --
-s(:list,  [s(:module,  "Soho",  [s(:call, 
+s(:expressions, 
-  s(:name,  "ofthen"), 
+  s(:module,  :Soho, 
+    s(:call, 
+      s(:name,  :ofthen), 
       s(:arguments, 
         s(:int,  3), 
-    s(:name,  "var"))), s(:function,  :int, 
+        s(:name,  :var))), 
-  s(:name,  "ofthen"), 
+    s(:function,  :int, 
+      s(:name,  :ofthen), 
       s(:parameters, 
         s(:field,  :int,  :n), 
         s(:field,  :ref,  :m)), 
       s(:expressions, 
         s(:return, 
-      s(:int,  44))))])])
+          s(:int,  44))))))

test/cases/module_def/module_if.tst

@@ -8,8 +8,10 @@ module Foo
   end
 end
 -- -- --
-s(:list,  [s(:module,  "Foo",  [s(:function,  :ref,
+s(:expressions, 
-  s(:name,  "ofthen"),
+  s(:module,  :Foo, 
+    s(:function,  :ref, 
+      s(:name,  :ofthen), 
       s(:parameters, 
         s(:field,  :int,  :n)), 
       s(:expressions, 
@@ -18,8 +20,8 @@ s(:list,  [s(:module,  "Foo",  [s(:function,  :ref,
             s(:int,  0)), 
           s(:if_true, 
             s(:assign, 
-          s(:name,  "isit"),
+              s(:name,  :isit), 
               s(:int,  42))), 
           s(:if_false,  [s(:assign, 
-  s(:name,  "maybenot"),
+  s(:name,  :maybenot), 
-  s(:int,  667))]))))])])
+  s(:int,  667))]))))))

test/cases/module_def/module_ops.tst

@@ -5,16 +5,18 @@ module Opers
   end
 end
 -- -- --
-s(:list,  [s(:module,  "Opers",  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:module,  :Opers, 
+    s(:function,  :int, 
+      s(:name,  :foo), 
       s(:parameters, 
         s(:field,  :int,  :x)), 
       s(:expressions, 
-    s(:name,  "int"), 
+        s(:name,  :int), 
         s(:assign, 
-      s(:name,  "abba"), 
+          s(:name,  :abba), 
           s(:int,  5)), 
         s(:return, 
           s(:operator,  "+", 
-        s(:name,  "abba"), 
+            s(:name,  :abba), 
-        s(:int,  5)))))])])
+            s(:int,  5)))))))

test/cases/module_def/simplest_module.tst

@@ -2,4 +2,6 @@ module Simple
   5
 end
 -- -- --
-s(:list,  [s(:module,  "Simple",  [s(:int,  5)])])
+s(:expressions, 
+  s(:module,  :Simple, 
+    s(:int,  5)))

test/cases/return/return_int.tst

@@ -1,4 +1,5 @@
 return 42
 -- -- --
-s(:list,  [s(:return, 
+s(:expressions, 
-  s(:int,  42))])
+  s(:return, 
+    s(:int,  42)))

test/cases/return/return_string.tst

@@ -1,4 +1,5 @@
 return "hello"
 -- -- --
-s(:list,  [s(:return, 
+s(:expressions, 
-  s(:string,  "hello"))])
+  s(:return, 
+    s(:string,  "hello")))

test/cases/return/return_variable.tst

@@ -1,4 +1,5 @@
 return foo
 -- -- --
-s(:list,  [s(:return, 
+s(:expressions, 
-  s(:name,  "foo"))])
+  s(:return, 
+    s(:name,  :foo)))

test/cases/root/class_method.tst

@@ -3,9 +3,12 @@ class FooBo
 end
 
 -- -- --
-s(:list,  [s(:class,  "FooBo",  nil,  [s(:call, 
+s(:expressions, 
-  s(:name,  "call"), 
+  s(:class,  :FooBo, 
+    s(:derives,  nil), 
+    s(:call, 
+      s(:name,  :call), 
       s(:arguments, 
         s(:int,  35)), 
       s(:receiver, 
-    s(:module,  "Bar")))])])
+        s(:module,  "Bar")))))

test/cases/root/double_root.tst

@@ -4,14 +4,16 @@ end
 
 foo( 3 )
 -- -- --
-s(:list,  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "foo"), 
+  s(:function,  :int, 
+    s(:name,  :foo), 
     s(:parameters, 
       s(:field,  :ref,  :x)), 
     s(:expressions, 
       s(:assign, 
-      s(:name,  "a"), 
+        s(:name,  :a), 
-      s(:int,  5)))), s(:call, 
+        s(:int,  5)))), 
-  s(:name,  "foo"), 
+  s(:call, 
+    s(:name,  :foo), 
     s(:arguments, 
-    s(:int,  3)))])
+      s(:int,  3))))

test/cases/root/fibo1.tst

@@ -12,43 +12,45 @@ end
 
 fibonaccit( 10 )
 -- -- --
-s(:list,  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "fibonaccit"), 
+  s(:function,  :int, 
+    s(:name,  :fibonaccit), 
     s(:parameters, 
       s(:field,  :int,  :n)), 
     s(:expressions, 
       s(:assign, 
-      s(:name,  "a"), 
+        s(:name,  :a), 
         s(:int,  0)), 
       s(:assign, 
-      s(:name,  "b"), 
+        s(:name,  :b), 
         s(:int,  1)), 
       s(:while, 
         s(:condition, 
           s(:operator,  ">", 
-          s(:name,  "n"), 
+            s(:name,  :n), 
             s(:int,  1))), 
         s(:expressions, 
           s(:assign, 
-          s(:name,  "tmp"), 
+            s(:name,  :tmp), 
-          s(:name,  "a")), 
+            s(:name,  :a)), 
           s(:assign, 
-          s(:name,  "a"), 
+            s(:name,  :a), 
-          s(:name,  "b")), 
+            s(:name,  :b)), 
           s(:assign, 
-          s(:name,  "b"), 
+            s(:name,  :b), 
             s(:operator,  "+", 
-            s(:name,  "tmp"), 
+              s(:name,  :tmp), 
-            s(:name,  "b"))), 
+              s(:name,  :b))), 
           s(:call, 
-          s(:name,  "puts"), 
+            s(:name,  :puts), 
             s(:arguments, 
-            s(:name,  "b"))), 
+              s(:name,  :b))), 
           s(:assign, 
-          s(:name,  "n"), 
+            s(:name,  :n), 
             s(:operator,  "-", 
-            s(:name,  "n"), 
+              s(:name,  :n), 
-            s(:int,  1))))))), s(:call, 
+              s(:int,  1))))))), 
-  s(:name,  "fibonaccit"), 
+  s(:call, 
+    s(:name,  :fibonaccit), 
     s(:arguments, 
-    s(:int,  10)))])
+      s(:int,  10))))

test/cases/root/module_assignment.tst

@@ -4,13 +4,16 @@ module Fibo
 end
 
 -- -- --
-s(:list,  [s(:module,  "Fibo",  [s(:assign, 
+s(:expressions, 
-  s(:name,  "a"), 
+  s(:module,  :Fibo, 
+    s(:assign, 
+      s(:name,  :a), 
       s(:operator,  "+", 
         s(:int,  5), 
-    s(:name,  "foo"))), s(:call, 
+        s(:name,  :foo))), 
-  s(:name,  "bar"), 
+    s(:call, 
+      s(:name,  :bar), 
       s(:arguments, 
-    s(:name,  "b"), 
+        s(:name,  :b), 
-    s(:name,  "a"), 
+        s(:name,  :a), 
-    s(:name,  "r")))])])
+        s(:name,  :r)))))

test/cases/root/module_method.tst

@@ -8,17 +8,20 @@ module Fibo
 end
 
 -- -- --
-s(:list,  [s(:module,  "Fibo",  [s(:function,  :int, 
+s(:expressions, 
-  s(:name,  "fibonaccit"), 
+  s(:module,  :Fibo, 
+    s(:function,  :int, 
+      s(:name,  :fibonaccit), 
       s(:parameters, 
         s(:field,  :int,  :n)), 
       s(:expressions, 
-    s(:name,  "int"), 
+        s(:name,  :int), 
         s(:assign, 
-      s(:name,  "a"), 
+          s(:name,  :a), 
           s(:int,  0)), 
         s(:return, 
-      s(:name,  "a")))), s(:call, 
+          s(:name,  :a)))), 
-  s(:name,  "fibonaccit"), 
+    s(:call, 
+      s(:name,  :fibonaccit), 
       s(:arguments, 
-    s(:int,  10)))])])
+        s(:int,  10)))))

test/cases/root/root_module_class.tst

@@ -5,8 +5,12 @@ module FooBo
 end
 
 -- -- --
-s(:list,  [s(:module,  "FooBo",  [s(:class,  "Bar",  nil,  [s(:assign, 
+s(:expressions, 
-  s(:name,  "a"), 
+  s(:module,  :FooBo, 
+    s(:class,  :Bar, 
+      s(:derives,  nil), 
+      s(:assign, 
+        s(:name,  :a), 
         s(:operator,  "+", 
           s(:int,  5), 
-    s(:name,  "foo")))])])])
+          s(:name,  :foo))))))

test/cases/while/big_while.tst

@@ -6,29 +6,30 @@ while( n > 1)
   n = n - 1
 end
 -- -- --
-s(:list,  [s(:while, 
+s(:expressions, 
+  s(:while, 
     s(:condition, 
       s(:operator,  ">", 
-      s(:name,  "n"), 
+        s(:name,  :n), 
         s(:int,  1))), 
     s(:expressions, 
       s(:assign, 
-      s(:name,  "tmp"), 
+        s(:name,  :tmp), 
-      s(:name,  "a")), 
+        s(:name,  :a)), 
       s(:assign, 
-      s(:name,  "a"), 
+        s(:name,  :a), 
-      s(:name,  "b")), 
+        s(:name,  :b)), 
       s(:assign, 
-      s(:name,  "b"), 
+        s(:name,  :b), 
         s(:operator,  "+", 
-        s(:name,  "tmp"), 
+          s(:name,  :tmp), 
-        s(:name,  "b"))), 
+          s(:name,  :b))), 
       s(:call, 
-      s(:name,  "puts"), 
+        s(:name,  :puts), 
         s(:arguments, 
-        s(:name,  "b"))), 
+          s(:name,  :b))), 
       s(:assign, 
-      s(:name,  "n"), 
+        s(:name,  :n), 
         s(:operator,  "-", 
-        s(:name,  "n"), 
+          s(:name,  :n), 
-        s(:int,  1)))))])
+          s(:int,  1))))))

test/cases/while/while.tst

@@ -3,14 +3,15 @@ while(1)
   puts(b)
 end
 -- -- --
-s(:list,  [s(:while, 
+s(:expressions, 
+  s(:while, 
     s(:condition, 
       s(:int,  1)), 
     s(:expressions, 
       s(:assign, 
-      s(:name,  "tmp"), 
+        s(:name,  :tmp), 
-      s(:name,  "a")), 
+        s(:name,  :a)), 
       s(:call, 
-      s(:name,  "puts"), 
+        s(:name,  :puts), 
         s(:arguments, 
-        s(:name,  "b")))))])
+          s(:name,  :b))))))

test/cases/while/while_method.tst

@@ -3,20 +3,21 @@ while(1)
   tmp.puts(i)
 end
 -- -- --
-s(:list,  [s(:while, 
+s(:expressions, 
+  s(:while, 
     s(:condition, 
       s(:int,  1)), 
     s(:expressions, 
       s(:assign, 
-      s(:name,  "tmp"), 
+        s(:name,  :tmp), 
         s(:call, 
-        s(:name,  "new"), 
+          s(:name,  :new), 
           s(:arguments), 
           s(:receiver, 
             s(:module,  "String")))), 
       s(:call, 
-      s(:name,  "puts"), 
+        s(:name,  :puts), 
         s(:arguments, 
-        s(:name,  "i")), 
+          s(:name,  :i)), 
         s(:receiver, 
-        s(:name,  "tmp")))))])
+          s(:name,  :tmp))))))