revert come unnecessary changes in driver, add more info in {apply_status}

Author: Hongbo Zhang

bytecomp/lambda.ml

@@ -214,15 +214,15 @@ type meth_kind = Self | Public of public_info | Cached
 type shared_code = (int * int) list
 
 type apply_status = 
-  | NA
-  | Full 
-
+  | App_na
+  | App_ml_full
+  | App_js_full 
 type apply_info = {
     apply_loc : Location.t;
     apply_status : apply_status;
   }
 let default_apply_info ?(loc=Location.none) () = 
-  {apply_loc = loc; apply_status = NA}
+  {apply_loc = loc; apply_status = App_na}
 type lambda =
     Lvar of Ident.t
   | Lconst of structured_constant

bytecomp/lambda.mli

@@ -223,8 +223,9 @@ type meth_kind = Self | Public of public_info | Cached
 type shared_code = (int * int) list     (* stack size -> code label *)
 
 type apply_status = 
-  | NA
-  | Full 
+  | App_na
+  | App_ml_full 
+  | App_js_full
 
 type apply_info = {
     apply_loc : Location.t;

driver/compile.ml

@@ -55,24 +55,17 @@ let print_if ppf flag printer arg =
 
 let (++) x f = f x
 
-let serialize_raw_js = 
-  try ignore @@ Sys.getenv "OCAML_RAW_JS"; true with Not_found -> false
-
-
 let implementation ppf sourcefile outputprefix =
   Compmisc.init_path false;
   let modulename = module_of_filename ppf sourcefile outputprefix in
   Env.set_unit_name modulename;
   let env = Compmisc.initial_env() in
-  let finalenv = ref Env.empty in
-  let current_signature = ref [] in
   try
     let (typedtree, coercion) =
       Pparse.parse_implementation ~tool_name ppf sourcefile
       ++ print_if ppf Clflags.dump_parsetree Printast.implementation
       ++ print_if ppf Clflags.dump_source Pprintast.structure
-      ++ (fun x -> let (a,b,c,signature) = Typemod.type_implementation_more sourcefile outputprefix modulename env x  in
-       begin finalenv:=c; current_signature:= signature; a,b end)
+      ++ Typemod.type_implementation sourcefile outputprefix modulename env
       ++ print_if ppf Clflags.dump_typedtree
         Printtyped.implementation_with_coercion
     in
@@ -84,15 +77,6 @@ let implementation ppf sourcefile outputprefix =
         (typedtree, coercion)
         ++ Translmod.transl_implementation modulename
         ++ print_if ppf Clflags.dump_rawlambda Printlambda.lambda
-         (* (Printlambda.env_lambda !finalenv) *)
-        ++ (fun lambda -> 
-            (if serialize_raw_js then 
-               !Printlambda.serialize_raw_js 
-                 !finalenv !current_signature 
-                 sourcefile  lambda 
-            );
-            lambda
-           )
         ++ Simplif.simplify_lambda
         ++ print_if ppf Clflags.dump_lambda Printlambda.lambda
         ++ Bytegen.compile_implementation modulename

driver/optcompile.ml

@@ -70,7 +70,7 @@ let implementation ppf sourcefile outputprefix =
       ast
       ++ print_if ppf Clflags.dump_parsetree Printast.implementation
       ++ print_if ppf Clflags.dump_source Pprintast.structure
-      ++ ( fun x -> let (a,b,c,_) = Typemod.type_implementation_more sourcefile outputprefix modulename env x in (a,b))
+      ++ Typemod.type_implementation sourcefile outputprefix modulename env
       ++ print_if ppf Clflags.dump_typedtree
         Printtyped.implementation_with_coercion
     in