Compiler: refactoring

Author: hhugo

compiler/lib/driver.ml

@@ -295,6 +295,7 @@ let link ~export_runtime ~standalone ~linkall (js : Javascript.statement_list) :
   if (not export_runtime) && not standalone
   then { runtime_code = js; always_required_codes = [] }
   else
+    let check_missing = standalone in
     let t = Timer.make () in
     if times () then Format.eprintf "Start Linking...@.";
     let traverse = new Js_traverse.free in
@@ -335,12 +336,15 @@ let link ~export_runtime ~standalone ~linkall (js : Javascript.statement_list) :
     in
     let linkinfos = Linker.init () in
     let linkinfos, js =
-      let linkinfos, missing = Linker.resolve_deps ~standalone linkinfos used in
+      let linkinfos, missing = Linker.resolve_deps ~check_missing linkinfos used in
       (* gen_missing may use caml_failwith *)
       if (not (StringSet.is_empty missing)) && Config.Flag.genprim ()
       then
         let linkinfos, missing2 =
-          Linker.resolve_deps linkinfos (StringSet.singleton "caml_failwith")
+          Linker.resolve_deps
+            ~check_missing
+            linkinfos
+            (StringSet.singleton "caml_failwith")
         in
         let missing = StringSet.union missing missing2 in
         linkinfos, gen_missing js missing
@@ -384,7 +388,7 @@ let link ~export_runtime ~standalone ~linkall (js : Javascript.statement_list) :
       else js
     in
     let missing = Linker.missing linkinfos in
-    let output = Linker.link ~standalone js linkinfos in
+    let output = Linker.link ~check_missing js linkinfos in
     if not (List.is_empty missing)
     then
       { output with

compiler/lib/linker.ml

@@ -626,11 +626,11 @@ let init () =
   ; missing = StringSet.empty
   }
 
-let check_missing state =
+let do_check_missing state =
   if not (StringSet.is_empty state.missing)
   then error "missing dependency '%s'@." (StringSet.choose state.missing)
 
-let resolve_deps ?(standalone = true) visited_rev used =
+let resolve_deps ?(check_missing = true) visited_rev used =
   (* link the special files *)
   let missing, visited_rev =
     StringSet.fold
@@ -641,10 +641,10 @@ let resolve_deps ?(standalone = true) visited_rev used =
       used
       (StringSet.empty, visited_rev)
   in
-  if standalone then check_missing visited_rev;
+  if check_missing then do_check_missing visited_rev;
   visited_rev, missing
 
-let link ?(standalone = true) program (state : state) =
+let link ?(check_missing = true) program (state : state) =
   let always, always_required =
     List.partition
       ~f:(function
@@ -661,7 +661,7 @@ let link ?(standalone = true) program (state : state) =
         in
         { state with codes = (Ok always.program, false) :: state.codes })
   in
-  if standalone then check_missing state;
+  if check_missing then do_check_missing state;
   let codes =
     List.map state.codes ~f:(fun (x, has_macro) ->
         let c = unpack x in

compiler/lib/linker.mli

@@ -59,9 +59,9 @@ val list_all : unit -> StringSet.t
 
 val init : unit -> state
 
-val resolve_deps : ?standalone:bool -> state -> StringSet.t -> state * StringSet.t
+val resolve_deps : ?check_missing:bool -> state -> StringSet.t -> state * StringSet.t
 
-val link : ?standalone:bool -> Javascript.program -> state -> output
+val link : ?check_missing:bool -> Javascript.program -> state -> output
 
 val all : state -> string list