more tests

Author: bobzhang

jscomp/test/Makefile

@@ -72,7 +72,7 @@ OTHERS := literals a test_ari test_export2 test_internalOO test_obj_simple_ffi t
 	gpr_904_test gpr_858_unit2_test inner_unused \
 	set_gen bal_tree string_set string_set_test \
 	math_test bal_set_mini gpr_974_test test_cpp\
-	global_module_alias_test
+	global_module_alias_test class_fib_open_recursion_test
 
 
 

jscomp/test/class_fib_open_recursion_test.js

@@ -0,0 +1,93 @@
+'use strict';
+
+var Caml_builtin_exceptions = require("../../lib/js/caml_builtin_exceptions");
+var Hashtbl                 = require("../../lib/js/hashtbl");
+var Mt                      = require("./mt");
+var Block                   = require("../../lib/js/block");
+var Curry                   = require("../../lib/js/curry");
+var CamlinternalOO          = require("../../lib/js/camlinternalOO");
+
+var shared = ["calc"];
+
+var suites = [/* [] */0];
+
+var test_id = [0];
+
+function eq(loc, x, y) {
+  test_id[0] = test_id[0] + 1 | 0;
+  suites[0] = /* :: */[
+    /* tuple */[
+      loc + (" id " + test_id[0]),
+      function () {
+        return /* Eq */Block.__(0, [
+                  x,
+                  y
+                ]);
+      }
+    ],
+    suites[0]
+  ];
+  return /* () */0;
+}
+
+function fib_init($$class) {
+  var calc = CamlinternalOO.get_method_label($$class, "calc");
+  CamlinternalOO.set_method($$class, calc, function (self$neg1, x) {
+        if (x === 0 || x === 1) {
+          return 1;
+        }
+        else {
+          return Curry._2(self$neg1[0][calc], self$neg1, x - 1 | 0) + Curry._2(self$neg1[0][calc], self$neg1, x - 2 | 0) | 0;
+        }
+      });
+  return function (_, self) {
+    return CamlinternalOO.create_object_opt(self, $$class);
+  };
+}
+
+var fib = CamlinternalOO.make_class(shared, fib_init);
+
+function memo_fib_init($$class) {
+  var ids = CamlinternalOO.new_methods_variables($$class, shared, ["cache"]);
+  var calc = ids[0];
+  var cache = ids[1];
+  var inh = CamlinternalOO.inherits($$class, 0, 0, shared, fib, 1);
+  var obj_init = inh[0];
+  var calc$1 = inh[1];
+  CamlinternalOO.set_method($$class, calc, function (self$neg2, x) {
+        try {
+          return Hashtbl.find(self$neg2[cache], x);
+        }
+        catch (exn){
+          if (exn === Caml_builtin_exceptions.not_found) {
+            var v = Curry._2(calc$1, self$neg2, x);
+            Hashtbl.add(self$neg2[cache], x, v);
+            return v;
+          }
+          else {
+            throw exn;
+          }
+        }
+      });
+  return function (_, self) {
+    var self$1 = CamlinternalOO.create_object_opt(self, $$class);
+    self$1[cache] = Hashtbl.create(/* None */0, 31);
+    Curry._1(obj_init, self$1);
+    return CamlinternalOO.run_initializers_opt(self, self$1, $$class);
+  };
+}
+
+var memo_fib = CamlinternalOO.make_class(shared, memo_fib_init);
+
+var tmp = Curry._1(memo_fib[0], 0);
+
+eq('File "class_fib_open_recursion_test.ml", line 33, characters 5-12', Curry.js2(-1044768619, 1, tmp, 40), 165580141);
+
+Mt.from_pair_suites("class_fib_open_recursion_test.ml", suites[0]);
+
+exports.suites   = suites;
+exports.test_id  = test_id;
+exports.eq       = eq;
+exports.fib      = fib;
+exports.memo_fib = memo_fib;
+/* fib Not a pure module */

jscomp/test/class_fib_open_recursion_test.ml

@@ -0,0 +1,36 @@
+let suites :  Mt.pair_suites ref  = ref []
+let test_id = ref 0
+let eq loc x y = 
+  incr test_id ; 
+  suites := 
+    (loc ^" id " ^ (string_of_int !test_id), (fun _ -> Mt.Eq(x,y))) :: !suites
+
+
+class fib = object (self)
+   method calc x = 
+     if x =0 || x = 1  then 1 
+     else self#calc (x - 1 ) + self#calc (x - 2)
+end
+
+
+class memo_fib = object (self)
+   val cache = Hashtbl.create 31 
+   inherit fib as super 
+   method calc x =
+    match Hashtbl.find cache x with 
+    | exception Not_found -> 
+      let v = (super#calc x) in 
+      Hashtbl.add cache x v ; v
+    | v -> v 
+end
+
+
+
+
+let () = 
+  (* print_endline (string_of_int ((new fib)#calc 50)) *)
+
+  eq __LOC__ (((new memo_fib)#calc 40)) 165580141
+
+
+let () = Mt.from_pair_suites __FILE__ !suites