Merge pull request #449 from bloomberg/no_assert

-bs-rest-files option

Author: bobzhang

jscomp/bin/compiler.ml

@@ -1,4 +1,4 @@
-(** Bundled by ocaml_pack 05/23-09:55 *)
+(** Bundled by ocaml_pack 06/20-16:36 *)
 module Ext_bytes : sig 
 #1 "ext_bytes.mli"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -446,7 +446,7 @@ val with_file_as_pp : string -> (Format.formatter -> 'a) -> 'a
 
 val is_pos_pow : Int32.t -> int
 
-val failwithf : ('a, unit, string, 'b) format4 -> 'a
+val failwithf : loc:string -> ('a, unit, string, 'b) format4 -> 'a
 
 val invalid_argf : ('a, unit, string, 'b) format4 -> 'a
 
@@ -517,8 +517,9 @@ let  is_pos_pow n =
     else raise M.E in 
   try aux 0 n  with M.E -> -1
 
-let failwithf fmt = Format.ksprintf failwith fmt
-
+let failwithf ~loc fmt = Format.ksprintf (fun s -> failwith (loc ^ s))
+    fmt
+    
 let invalid_argf fmt = Format.ksprintf invalid_arg fmt
 
 let bad_argf fmt = Format.ksprintf (fun x -> raise (Arg.Bad x ) ) fmt
@@ -612,7 +613,7 @@ let rec process_line cwd filedir  line =
             (ml_exists, ml) @> (mli_exists , mli) @> []            
 
         | _ 
-          ->  Ext_pervasives.failwithf "invalid line %s" line
+          ->  Ext_pervasives.failwithf ~loc:__LOC__ "invalid line %s" line
       end
 
 (* example 

jscomp/bin/ocaml_pack.ml

@@ -257,3 +257,5 @@ let get_debug_file  () = !debug_file
 
 let is_same_file () = 
   !debug_file <> "" &&  !debug_file = !current_file
+
+let tool_name = "BuckleScript"

jscomp/common/js_config.ml

@@ -100,3 +100,5 @@ val set_debug_file : string -> unit
 val get_debug_file : unit -> string
 
 val is_same_file : unit -> bool 
+
+val tool_name : string

jscomp/common/js_config.mli

@@ -6,6 +6,9 @@ idents_analysis
 config_util
 
 
+ocaml_options
+ocaml_batch_compile
+ocaml_parse
 
 lam
 lam_iter

jscomp/core.mllib

@@ -306,4 +306,24 @@ let reduce_from_right fn lst =
     | _ -> invalid_arg "Ext_list.reduce" 
   end
 
+type 'a t = 'a list ref
 
+let create_ref_empty () = ref []
+
+let ref_top x = 
+  match !x with 
+  | y::_ -> y 
+  | _ -> invalid_arg "Ext_list.ref_top"
+
+let ref_empty x = 
+  match !x with [] -> true | _ -> false 
+
+let ref_push x refs = 
+  refs := x :: !refs
+
+let ref_pop refs = 
+  match !refs with 
+  | [] -> invalid_arg "Ext_list.ref_pop"
+  | x::rest -> 
+    refs := rest ; 
+    x     

jscomp/ext/ext_list.ml

@@ -91,4 +91,18 @@ val find_opt : ('a -> 'b option) -> 'a list -> 'b option
 (** [f] is applied follow the list order *)
 val split_map : ('a -> 'b * 'c) -> 'a list -> 'b list * 'c list       
 
+
 val reduce_from_right : ('a -> 'a -> 'a) -> 'a list -> 'a
+
+
+type 'a t = 'a list ref
+
+val create_ref_empty : unit -> 'a t
+
+val ref_top : 'a t -> 'a 
+
+val ref_empty : 'a t -> bool
+
+val ref_push : 'a -> 'a t -> unit
+
+val ref_pop : 'a t -> 'a

jscomp/ext/ext_list.mli

@@ -48,3 +48,5 @@ val mem : 'a hashset -> 'a -> bool
 val iter : ('a -> unit) -> 'a hashset -> unit
 
 val elements : 'a hashset -> 'a list
+
+val length : 'a hashset -> int 

jscomp/ext/hash_set.mli

@@ -20,21 +20,16 @@ open Compenv
 
 let fprintf = Format.fprintf
 
-let tool_name = "BuckleScript"
+
 
 let print_if ppf flag printer arg =
   if !flag then fprintf ppf "%a@." printer arg;
   arg
 
-let interface ppf sourcefile outputprefix =
-  Compmisc.init_path false;
+let after_parsing_sig ppf sourcefile outputprefix ast  = 
   let modulename = module_of_filename ppf sourcefile outputprefix in
-  Env.set_unit_name modulename;
   let initial_env = Compmisc.initial_env () in
-  let ast = Pparse.parse_interface ~tool_name ppf sourcefile in
-  let ast = if !Js_config.no_builtin_ppx_mli then ast else  !Ppx_entry.rewrite_signature ast in
-  if !Clflags.dump_parsetree then fprintf ppf "%a@." Printast.interface ast;
-  if !Clflags.dump_source then fprintf ppf "%a@." Pprintast.signature ast;
+  Env.set_unit_name modulename;
   let tsg = Typemod.type_interface initial_env ast in
   if !Clflags.dump_typedtree then fprintf ppf "%a@." Printtyped.interface tsg;
   let sg = tsg.sig_type in
@@ -51,20 +46,23 @@ let interface ppf sourcefile outputprefix =
       initial_env sg ;
   end
 
-let implementation ppf sourcefile outputprefix =
+let interface ppf sourcefile outputprefix =
   Compmisc.init_path false;
+  Ocaml_parse.parse_interface ppf sourcefile
+  |> print_if ppf Clflags.dump_parsetree Printast.interface
+  |> print_if ppf Clflags.dump_source Pprintast.signature 
+  |> after_parsing_sig ppf sourcefile outputprefix 
+
+let after_parsing_impl ppf sourcefile outputprefix ast =
   let modulename = Compenv.module_of_filename ppf sourcefile outputprefix in
-  Env.set_unit_name modulename;
   let env = Compmisc.initial_env() in
+  Env.set_unit_name modulename;
   try
     let (typedtree, coercion, finalenv, current_signature) =
-      Pparse.parse_implementation ~tool_name ppf sourcefile
-      |> print_if ppf Clflags.dump_parsetree Printast.implementation
-      |> (fun x -> if !Js_config.no_builtin_ppx_ml then x else  !Ppx_entry.rewrite_implementation x )
-      |> print_if ppf Clflags.dump_source Pprintast.structure
+      ast 
       |> Typemod.type_implementation_more sourcefile outputprefix modulename env 
       |> print_if ppf Clflags.dump_typedtree
-          (fun fmt (ty,co,_,_) -> Printtyped.implementation_with_coercion fmt  (ty,co))
+        (fun fmt (ty,co,_,_) -> Printtyped.implementation_with_coercion fmt  (ty,co))
     in
     if !Clflags.print_types then begin
       Warnings.check_fatal ();
@@ -74,9 +72,9 @@ let implementation ppf sourcefile outputprefix =
       |> print_if ppf Clflags.dump_rawlambda Printlambda.lambda
       |> (fun lambda -> 
           match           
-          Lam_compile_group.lambda_as_module
-            finalenv current_signature 
-            sourcefile  outputprefix ((* Obj.magic *) lambda ) with
+            Lam_compile_group.lambda_as_module
+              finalenv current_signature 
+              sourcefile  outputprefix lambda  with
           | e -> e 
           | exception e -> 
             (* Save to a file instead so that it will not scare user *)            
@@ -94,3 +92,10 @@ let implementation ppf sourcefile outputprefix =
   with x ->
     Stypes.dump (Some (outputprefix ^ ".annot"));
     raise x
+
+let implementation ppf sourcefile outputprefix =
+  Compmisc.init_path false;
+  Ocaml_parse.parse_implementation ppf sourcefile
+  |> print_if ppf Clflags.dump_parsetree Printast.implementation
+  |> print_if ppf Clflags.dump_source Pprintast.structure
+  |> after_parsing_impl ppf sourcefile outputprefix 

jscomp/js_implementation.ml

@@ -37,6 +37,9 @@
  *)
 val interface : Format.formatter -> string -> string -> unit
 
+val after_parsing_sig : Format.formatter -> string -> string -> Parsetree.signature -> unit
 
 val implementation : Format.formatter -> string -> string -> unit
 (** [implementation ppf sourcefile outprefix] compiles to JS directly *) 
+
+val after_parsing_impl : Format.formatter -> string -> string -> Parsetree.structure -> unit