support parse flags per file

Author: bobzhang

jscomp/main/js_main.ml

@@ -320,7 +320,7 @@ let buckle_script_flags : (string * Arg.spec * string) list =
    :: 
    ("-bs-no-cross-module-opt", 
     Arg.Clear Js_config.cross_module_inline, 
-    "enable cross module inlining(experimental), default(false)")  
+    "disable cross module inlining(experimental)")  
   :: 
   ("-bs-diagnose",
    Arg.Set Js_config.diagnose, 
@@ -354,16 +354,29 @@ let buckle_script_flags : (string * Arg.spec * string) list =
 
 
 
+let file_level_flags_handler (e : Parsetree.expression option) = 
+  match e with 
+  | None -> ()
+  | Some {pexp_desc = Pexp_array args } -> 
+    let args = Array.of_list 
+        (Sys.executable_name :: Ext_list.map  args (fun e -> 
+             match e.pexp_desc with 
+             | Pexp_constant (Pconst_string(name,_)) -> name 
+             | _ -> Location.raise_errorf ~loc:e.pexp_loc "string literal expected" )) in               
+    Arg.parse_argv ~current:(ref 0)
+      args buckle_script_flags ignore usage
+  ;Format.fprintf Format.err_formatter "%a %b@." 
+      Ext_obj.pp_any args !Js_config.cross_module_inline;
+  | Some e -> 
+    Location.raise_errorf ~loc:e.pexp_loc "string array expected"
 
-let _ = 
-  (* (
-    print_endline 
-      ("BSB_PROJECT_ROOT :" ^ 
-       match Sys.getenv_opt "BSB_PROJECT_ROOT" with 
-       | None ->  "None"
-       | Some s -> s 
-      )); *)
+let _ : unit =   
   Bs_conditional_initial.setup_env ();
+  let flags = "flags" in 
+  Ast_config.structural_config_table := Map_string.add !Ast_config.structural_config_table
+      flags file_level_flags_handler;    
+  Ast_config.signature_config_table := Map_string.add !Ast_config.signature_config_table
+      flags file_level_flags_handler;    
   try
     Compenv.readenv ppf Before_args;
     Arg.parse buckle_script_flags anonymous usage;

jscomp/stdlib-406/sys.ml

@@ -1,3 +1,4 @@
+[@@@bs.config { flags = [|"-bs-no-cross-module-opt"; |]}]
 #2 "stdlib/sys.mlp"
 (**************************************************************************)
 (*                                                                        *)

jscomp/stdlib-406/unix.ml

@@ -12,7 +12,7 @@
 (*   special exception on linking described in the file LICENSE.          *)
 (*                                                                        *)
 (**************************************************************************)
-
+[@@@bs.config { flags = [|"-bs-no-cross-module-opt" |]}]
 type error =
     E2BIG
   | EACCES

jscomp/syntax/ast_config.ml

@@ -25,26 +25,21 @@
 
 type action_table = 
   (Parsetree.expression option -> unit) Map_string.t
-(** global configurations below *)
-let common_actions_table :
-  (string *  (Parsetree.expression option -> unit)) list =
-  [
-  ]
 
 
-let structural_config_table : action_table =
-  Map_string.of_list
-    (( "no_export" ,
+let structural_config_table : action_table ref =
+  ref (Map_string.singleton
+     "no_export" 
        (fun x ->
           Js_config.no_export := (
             match x with
             |Some e -> Ast_payload.assert_bool_lit e
             | None -> true)
        ))
-     :: common_actions_table)
+     
 
-let signature_config_table : action_table =
-  Map_string.of_list common_actions_table
+let signature_config_table : action_table ref =
+  ref Map_string.empty
 
 
 let rec iter_on_bs_config_stru (x :Parsetree.structure) =   
@@ -53,7 +48,7 @@ let rec iter_on_bs_config_stru (x :Parsetree.structure) =
   | {pstr_desc = Pstr_attribute (({txt = "bs.config"; loc}, payload) as attr)}::_ -> 
     Bs_ast_invariant.mark_used_bs_attribute attr;
     Ext_list.iter (Ast_payload.ident_or_record_as_config loc payload)
-      (Ast_payload.table_dispatch structural_config_table)
+      (Ast_payload.table_dispatch !structural_config_table)
   | {pstr_desc = Pstr_attribute _} :: rest -> 
     iter_on_bs_config_stru rest 
   | non_attr :: _ -> ()    
@@ -64,7 +59,7 @@ let rec iter_on_bs_config_sigi (x :Parsetree.signature) =
   | {psig_desc = Psig_attribute (({txt = "bs.config"; loc}, payload) as attr)}::_ -> 
     Bs_ast_invariant.mark_used_bs_attribute attr;
     Ext_list.iter (Ast_payload.ident_or_record_as_config loc payload)
-      (Ast_payload.table_dispatch signature_config_table)
+      (Ast_payload.table_dispatch !signature_config_table)
   | {psig_desc = Psig_attribute _} :: rest -> 
     iter_on_bs_config_sigi rest 
   | non_attr :: _ -> ()      

jscomp/syntax/ast_config.mli

@@ -22,9 +22,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
+type action_table = 
+  (Parsetree.expression option -> unit) Map_string.t
 
 
-
+val structural_config_table : action_table ref
+val signature_config_table : action_table ref
+ 
 val iter_on_bs_config_stru : 
   Parsetree.structure ->  
   unit  

jscomp/test/bs_MapInt_test.ml

@@ -1,3 +1,4 @@
+[@@@bs.config{flags = [|"-bs-no-cross-module-opt"; |] }]
 let should b = 
   if not b then Js.Exn.raiseError "IMPOSSIBLE"
 

lib/es6/unix.js

@@ -4,17 +4,16 @@ import * as Sys from "./sys.js";
 import * as List from "./list.js";
 import * as $$Array from "./array.js";
 import * as Block from "./block.js";
+import * as Bytes from "./bytes.js";
 import * as Curry from "./curry.js";
 import * as Printf from "./printf.js";
 import * as $$String from "./string.js";
-import * as Caml_io from "./caml_io.js";
 import * as Hashtbl from "./hashtbl.js";
 import * as Callback from "./callback.js";
 import * as Caml_sys from "./caml_sys.js";
 import * as Filename from "./filename.js";
 import * as Printexc from "./printexc.js";
 import * as Caml_array from "./caml_array.js";
-import * as Caml_bytes from "./caml_bytes.js";
 import * as Pervasives from "./pervasives.js";
 import * as Caml_format from "./caml_format.js";
 import * as Caml_exceptions from "./caml_exceptions.js";
@@ -459,40 +458,34 @@ function execvpe(name, args, env) {
 
 function read(fd, buf, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (buf.length - len | 0)) {
-    throw [
-          Caml_builtin_exceptions.invalid_argument,
-          "Unix.read"
-        ];
+    return Pervasives.invalid_arg("Unix.read");
+  } else {
+    return Caml_external_polyfill.resolve("unix_read")(fd, buf, ofs, len);
   }
-  return Caml_external_polyfill.resolve("unix_read")(fd, buf, ofs, len);
 }
 
 function write(fd, buf, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (buf.length - len | 0)) {
-    throw [
-          Caml_builtin_exceptions.invalid_argument,
-          "Unix.write"
-        ];
+    return Pervasives.invalid_arg("Unix.write");
+  } else {
+    return Caml_external_polyfill.resolve("unix_write")(fd, buf, ofs, len);
   }
-  return Caml_external_polyfill.resolve("unix_write")(fd, buf, ofs, len);
 }
 
 function single_write(fd, buf, ofs, len) {
   if (ofs < 0 || len < 0 || ofs > (buf.length - len | 0)) {
-    throw [
-          Caml_builtin_exceptions.invalid_argument,
-          "Unix.single_write"
-        ];
+    return Pervasives.invalid_arg("Unix.single_write");
+  } else {
+    return Caml_external_polyfill.resolve("unix_single_write")(fd, buf, ofs, len);
   }
-  return Caml_external_polyfill.resolve("unix_single_write")(fd, buf, ofs, len);
 }
 
 function write_substring(fd, buf, ofs, len) {
-  return write(fd, Caml_bytes.bytes_of_string(buf), ofs, len);
+  return write(fd, Bytes.unsafe_of_string(buf), ofs, len);
 }
 
 function single_write_substring(fd, buf, ofs, len) {
-  return single_write(fd, Caml_bytes.bytes_of_string(buf), ofs, len);
+  return single_write(fd, Bytes.unsafe_of_string(buf), ofs, len);
 }
 
 function map_file(fd, posOpt, kind, layout, shared, dims) {
@@ -557,50 +550,42 @@ function domain_of_sockaddr(param) {
 
 function recv(fd, buf, ofs, len, flags) {
   if (ofs < 0 || len < 0 || ofs > (buf.length - len | 0)) {
-    throw [
-          Caml_builtin_exceptions.invalid_argument,
-          "Unix.recv"
-        ];
+    return Pervasives.invalid_arg("Unix.recv");
+  } else {
+    return Caml_external_polyfill.resolve("unix_recv")(fd, buf, ofs, len, flags);
   }
-  return Caml_external_polyfill.resolve("unix_recv")(fd, buf, ofs, len, flags);
 }
 
 function recvfrom(fd, buf, ofs, len, flags) {
   if (ofs < 0 || len < 0 || ofs > (buf.length - len | 0)) {
-    throw [
-          Caml_builtin_exceptions.invalid_argument,
-          "Unix.recvfrom"
-        ];
+    return Pervasives.invalid_arg("Unix.recvfrom");
+  } else {
+    return Caml_external_polyfill.resolve("unix_recvfrom")(fd, buf, ofs, len, flags);
   }
-  return Caml_external_polyfill.resolve("unix_recvfrom")(fd, buf, ofs, len, flags);
 }
 
 function send(fd, buf, ofs, len, flags) {
   if (ofs < 0 || len < 0 || ofs > (buf.length - len | 0)) {
-    throw [
-          Caml_builtin_exceptions.invalid_argument,
-          "Unix.send"
-        ];
+    return Pervasives.invalid_arg("Unix.send");
+  } else {
+    return Caml_external_polyfill.resolve("unix_send")(fd, buf, ofs, len, flags);
   }
-  return Caml_external_polyfill.resolve("unix_send")(fd, buf, ofs, len, flags);
 }
 
 function sendto(fd, buf, ofs, len, flags, addr) {
   if (ofs < 0 || len < 0 || ofs > (buf.length - len | 0)) {
-    throw [
-          Caml_builtin_exceptions.invalid_argument,
-          "Unix.sendto"
-        ];
+    return Pervasives.invalid_arg("Unix.sendto");
+  } else {
+    return Caml_external_polyfill.resolve("unix_sendto")(fd, buf, ofs, len, flags, addr);
   }
-  return Caml_external_polyfill.resolve("unix_sendto")(fd, buf, ofs, len, flags, addr);
 }
 
 function send_substring(fd, buf, ofs, len, flags) {
-  return send(fd, Caml_bytes.bytes_of_string(buf), ofs, len, flags);
+  return send(fd, Bytes.unsafe_of_string(buf), ofs, len, flags);
 }
 
 function sendto_substring(fd, buf, ofs, len, flags, addr) {
-  return sendto(fd, Caml_bytes.bytes_of_string(buf), ofs, len, flags, addr);
+  return sendto(fd, Bytes.unsafe_of_string(buf), ofs, len, flags, addr);
 }
 
 function SO_get(prim, prim$1, prim$2) {
@@ -1025,7 +1010,7 @@ function open_process_in(cmd) {
     open_proc(cmd, undefined, /* Process_in */Block.__(1, [inchan]), 0, in_write, 2);
   }
   catch (e){
-    Caml_external_polyfill.resolve("caml_ml_close_channel")(inchan);
+    Pervasives.close_in(inchan);
     Caml_external_polyfill.resolve("unix_close")(in_write);
     throw e;
   }
@@ -1041,8 +1026,7 @@ function open_process_out(cmd) {
     open_proc(cmd, undefined, /* Process_out */Block.__(2, [outchan]), out_read, 1, 2);
   }
   catch (e){
-    Caml_io.caml_ml_flush(outchan);
-    Caml_external_polyfill.resolve("caml_ml_close_channel")(outchan);
+    Pervasives.close_out(outchan);
     Caml_external_polyfill.resolve("unix_close")(out_read);
     throw e;
   }
@@ -1166,15 +1150,14 @@ function find_proc_id(fun_name, proc) {
 
 function close_process_in(inchan) {
   var pid = find_proc_id("close_process_in", /* Process_in */Block.__(1, [inchan]));
-  Caml_external_polyfill.resolve("caml_ml_close_channel")(inchan);
+  Pervasives.close_in(inchan);
   return waitpid_non_intr(pid)[1];
 }
 
 function close_process_out(outchan) {
   var pid = find_proc_id("close_process_out", /* Process_out */Block.__(2, [outchan]));
   try {
-    Caml_io.caml_ml_flush(outchan);
-    Caml_external_polyfill.resolve("caml_ml_close_channel")(outchan);
+    Pervasives.close_out(outchan);
   }
   catch (raw_exn){
     var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -1193,10 +1176,9 @@ function close_process(param) {
           inchan,
           outchan
         ]));
-  Caml_external_polyfill.resolve("caml_ml_close_channel")(inchan);
+  Pervasives.close_in(inchan);
   try {
-    Caml_io.caml_ml_flush(outchan);
-    Caml_external_polyfill.resolve("caml_ml_close_channel")(outchan);
+    Pervasives.close_out(outchan);
   }
   catch (raw_exn){
     var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -1217,10 +1199,9 @@ function close_process_full(param) {
           outchan,
           errchan
         ]));
-  Caml_external_polyfill.resolve("caml_ml_close_channel")(inchan);
+  Pervasives.close_in(inchan);
   try {
-    Caml_io.caml_ml_flush(outchan);
-    Caml_external_polyfill.resolve("caml_ml_close_channel")(outchan);
+    Pervasives.close_out(outchan);
   }
   catch (raw_exn){
     var exn = Caml_js_exceptions.internalToOCamlException(raw_exn);
@@ -1229,7 +1210,7 @@ function close_process_full(param) {
     }
 
   }
-  Caml_external_polyfill.resolve("caml_ml_close_channel")(errchan);
+  Pervasives.close_in(errchan);
   return waitpid_non_intr(pid)[1];
 }