Add UnitTest for closTrans

diff --git a/src/OMakefile b/src/OMakefile
index 310f9be..0dfe6dd 100644 (file)
--- a/src/OMakefile
+++ b/src/OMakefile
@@ -46,6 +46,7 @@ FILES[] =
        base
        bytes
        closuretrans
+       closTrans
        codegen
        cpool
        hList

diff --git a/src/closTrans.ml b/src/closTrans.ml
index 4a7b458..2878525 100644 (file)
--- a/src/closTrans.ml
+++ b/src/closTrans.ml
@@ -22,7 +22,7 @@ let methods_table program =
             ());
     tbl
 
-let classize tbl program =
+let classize program tbl =
   HList.concat_map 
     (function
         Plain stmt ->
@@ -31,3 +31,6 @@ let classize tbl program =
           [Ast.Class (klass,super,Hashtbl.find_all tbl klass)]
        | DefineMethod _ ->
           []) program
+
+let trans program =
+  classize program @@ methods_table program

diff --git a/test/OMakefile b/test/OMakefile
index eecd8a9..02f4cdd 100644 (file)
--- a/test/OMakefile
+++ b/test/OMakefile
@@ -54,6 +54,7 @@ FILES[] =
        test_base
        test_bytes
        test_closuretrans
+       test_clostrans
        test_codegen
        test_cpool
        test_hList

diff --git a/test/runner.ml b/test/runner.ml
index 454e208..a31b8f4 100644 (file)
--- a/test/runner.ml
+++ b/test/runner.ml
@@ -13,6 +13,7 @@ open Test_asm
 open Test_ast
 open Test_base
 open Test_bytes
+open Test_clostrans
 open Test_closuretrans
 open Test_codegen
 open Test_cpool

diff --git a/test/test_clostrans.ml b/test/test_clostrans.ml
new file mode 100644 (file)
index 0000000..f12a6b0
--- /dev/null
+++ b/test/test_clostrans.ml
@@ -0,0 +1,20 @@
+open Base
+open ClosTrans
+open Ast
+
+let assert_equal x y =
+  OUnit.assert_equal ~printer:Ast.to_string_stmt x y
+
+let the_one =
+  function [x] -> x
+    | _ -> failwith "list is not one"
+
+test trans =
+    let expect = Class ("Foo",("bar","Baz"),
+                       [("f",["self";"x"],Int 42)]) in
+    let source = [DefineClass ("Foo",("bar","Baz"),[]);
+                 DefineMethod ("f",("self","Foo"),["x"],Int 42)] in
+      assert_equal expect @@ the_one @@ trans source
+
+test plain_is_not_change =
+    assert_equal (Expr (Int 42)) @@ the_one @@ trans [Plain (Expr (Int 42))]