Partially revert commit 46a5262a (only file...

Partially revert commit 46a5262a (only file typing/typer.ml) to make balance type (in toplevel). This should be investigated more thoroughly.

typing/typer.ml

@@ -395,8 +395,8 @@ module IType = struct
              let l = ref [] in
              for i=0 to (Array.length pargs) - 1 do
                try
-                 let err s = Error s in
-                 l := (pargs.(i), typ ~err (derecurs env a.(i)))::!l
+                 let tt = typ ~err:(fun s -> Error s) (derecurs env a.(i)) in
+                 l := (pargs.(i), tt)::!l
                with 
                |Error s -> raise_loc_generic loc s
                |_ -> assert false
@@ -469,9 +469,9 @@ module IType = struct
              (U.to_string v)
             );
         let al =
-          let a = Array.make (List.length pl) (Var.mk "dummy") in
-          (* List.iteri (fun i v -> a.(i) <- (List.assoc (U.to_string v) vars)) pl; *)
-          List.iteri (fun i v -> a.(i) <- Var.mk (Ident.U.to_string v)) pl;
+          let a = Array.make (List.length pl) (Var.mk "dummy")in
+          (* XXX here I use pervasive.compare instead of string compare *)
+          List.iteri (fun i v -> a.(i) <- (List.assoc (U.to_string v) vars)) pl;
           a
         in 
         (v',t,al)