Merge pull request #4166 from BuckleScript/wip_in_meory_loading

In  memory loading that works

Author: bobzhang

jscomp/bsb/bsb_ninja_gen.ml

@@ -142,14 +142,7 @@ let output_ninja_and_namespace_map
         (* resolved earlier *)
         Bsb_ninja_targets.output_kv Bsb_ninja_global_vars.gentypeconfig
           ("-bs-gentype " ^ x.path) oc
-      );
-    Ext_option.iter built_in_dependency (fun x -> 
-      Bsb_ninja_targets.output_kv Bsb_ninja_global_vars.g_stdlib_incl
-      (Ext_filename.maybe_quote x.package_install_path) oc 
-    )  
-    ;  
-    
-
+      );    
     Bsb_ninja_targets.output_kvs
       [|
         Bsb_ninja_global_vars.g_pkg_flg, g_pkg_flg ; 

jscomp/bsb/bsb_ninja_global_vars.ml

@@ -54,5 +54,3 @@ let gentypeconfig = "gentypeconfig"
 
 let g_dev_incls = "g_dev_incls"
 
-(* path to stdlib *)
-let g_stdlib_incl = "g_std_incl"

jscomp/bsb/bsb_ninja_rule.ml

@@ -129,7 +129,7 @@ let make_custom_rules
       ~is_dev 
       ~postbuild : string =     
     Buffer.clear buf;
-    Buffer.add_string buf "$bsc -nostdlib $g_pkg_flg -color always";
+    Buffer.add_string buf "$bsc $g_pkg_flg -color always";
     if bs_suffix then
       Buffer.add_string buf " -bs-suffix";
     if read_cmi then 
@@ -139,8 +139,8 @@ let make_custom_rules
     Buffer.add_string buf " $g_lib_incls" ;
     if is_dev then
       Buffer.add_string buf " $g_dpkg_incls";
-    if has_builtin then   
-      Buffer.add_string buf " -I $g_std_incl";
+    if not has_builtin then   
+      Buffer.add_string buf " -nostdlib";
     Buffer.add_string buf " $warnings $bsc_flags";
     if has_gentype then
       Buffer.add_string buf " $gentypeconfig";

jscomp/build_tests/bucklescript-tea/bsconfig.json

@@ -2,6 +2,7 @@
   "name": "bucklescript-tea",
   "version": "0.6.11",
   "bsc-flags": [
+    "-bs-diagnose",
     "-bs-cross-module-opt"
   ],
   "package-specs": {
@@ -14,6 +15,6 @@
       "dir": "test",
       "type": "dev"
     }
-  ],
+  ],  
   "suffix": ".bs.js"
 }

jscomp/build_tests/bucklescript-tea/input.js

@@ -1,4 +1,10 @@
+var p = require("child_process");
 
-var p = require('child_process')
+var o = p.spawnSync(`bsb`);
 
-p.execSync(`bsb`)
+console.log(o.stderr + "");
+console.log("-----");
+console.log(o.stdout + "");
+if (o.error) {
+  throw o.error;
+}

jscomp/common/bs_version.ml

@@ -22,7 +22,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)    
-let version = "7.1.1-dev.1"
+let version = "7.2.0-dev.1"
 let header = 
    "// Generated by BUCKLESCRIPT, PLEASE EDIT WITH CARE"  
 let package_name = "bs-platform"   

jscomp/common/js_config.ml

@@ -110,3 +110,5 @@ let is_reason = ref false
 let js_stdout = ref true
 
 let all_module_aliases = ref false
+
+let no_stdlib = ref false

jscomp/common/js_config.mli

@@ -107,3 +107,5 @@ val is_reason : bool ref
 val js_stdout : bool ref 
 
 val all_module_aliases : bool ref 
+
+val no_stdlib: bool ref

jscomp/core/bs_cmi_load.ml

@@ -1,11 +1,42 @@
+(* Copyright (C) Authors of BuckleScript
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * In addition to the permissions granted to you by the LGPL, you may combine
+ * or link a "work that uses the Library" with a publicly distributed version
+ * of this file to produce a combined library or application, then distribute
+ * that combined work under the terms of your choosing, with no requirement
+ * to comply with the obligations normally placed on you by section 4 of the
+ * LGPL version 3 (or the corresponding section of a later version of the LGPL
+ * should you choose to use a later version).
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-(* TODO: provide native load*)
-let browse_load ~unit_name : Env.Persistent_signature.t option=
-  match Ext_string_array.find_sorted_assoc Builtin_cmi_datasets.module_sets_cmi unit_name with
-  | Some cmi ->
-    (* Format.fprintf Format.err_formatter "reading %s@." unit_name; *)
-    Some {filename = Sys.executable_name ; 
-          cmi = 
-            Lazy.force cmi}
-  | None -> assert false
+
+let load_cmi ~unit_name : Env.Persistent_signature.t option =
+  match Config_util.find_opt (unit_name ^".cmi") with 
+  | Some filename -> Some {filename; cmi = Cmi_format.read_cmi filename}
+  | None ->
+    if !Js_config.no_stdlib then None
+    else 
+      match Ext_string_array.find_sorted_assoc Builtin_cmi_datasets.module_sets_cmi unit_name with
+      | Some cmi ->
+        if Js_config.get_diagnose () then
+          Format.fprintf Format.err_formatter ">Cmi: %s@." unit_name;
+        let lazy cmi = cmi in   
+        if Js_config.get_diagnose () then
+          Format.fprintf Format.err_formatter "<Cmi: %s@." unit_name;
+        Some {filename = Sys.executable_name ; 
+              cmi }
+      | None -> None

jscomp/core/bs_conditional_initial.ml

@@ -26,9 +26,8 @@
 (* default to false -check later*)
 (* Clflags.keep_locs := false; *)
 let setup_env () =
-#if BS_BROWSER then
-  Env.Persistent_signature.load := Bs_cmi_load.browse_load;  
-#end
+  Env.Persistent_signature.load := Bs_cmi_load.load_cmi;    
+  Clflags.no_std_include := true;
   Warnings.parse_options false Bsc_warnings.defaults_w;
   Warnings.parse_options true Bsc_warnings.defaults_warn_error;
   Clflags.dump_location := false;