move json to ext (#1051)

Author: bobzhang

jscomp/Makefile

@@ -182,6 +182,7 @@ EXT_SRCS = ext_util\
 	ext_pp_scope\
 	ext_io\
 	ext_sexp\
+	ext_json\
 	ident_hash_set\
 	hash_set_poly\
 	ident_hashtbl\
@@ -226,7 +227,7 @@ CORE_CMXS=$(addprefix core/, $(addsuffix .cmx, $(CORE_SRCS)))
 OTHER_CORE_SRCS= bsppx_main bspack_main jsoo_main  bspp_main js_cmi_datasets \
 		 js_main
 OTHER_CORE_CMXS= $(addprefix core/, $(addsuffix .cmx, $(OTHER_CORE_SRCS)))
-BSB_SRCS= bsb_config bsb_build_schemas bsb_build_util bsb_dep_infos bsb_dir bsb_json bsb_ninja bsb_build_ui bsb_default bsb_gen
+BSB_SRCS= bsb_config bsb_build_schemas bsb_build_util bsb_dep_infos bsb_dir bsb_ninja bsb_build_ui bsb_default bsb_gen
 
 BSB_CMXS=$(addprefix bsb/, $(addsuffix .cmx, $(BSB_SRCS)))
 MAIN_SRCS= jsgen_main jscmj_main bsb/bsb_main bsb/bsb_helper_main

jscomp/all.depend

@@ -65,6 +65,7 @@ ext/ext_pp_scope.cmx : ext/string_map.cmx ext/int_map.cmx ext/ident_set.cmx \
     ext/ext_pp_scope.cmi
 ext/ext_io.cmx : ext/ext_pervasives.cmx ext/ext_io.cmi
 ext/ext_sexp.cmx : ext/ext_sexp.cmi
+ext/ext_json.cmx : ext/string_map.cmx ext/ext_array.cmx ext/ext_json.cmi
 ext/ident_hash_set.cmx : ext/hash_set_gen.cmx ext/ext_ident.cmx \
     stubs/bs_hash_stubs.cmx ext/ident_hash_set.cmi
 ext/hash_set_poly.cmx : ext/hash_set_gen.cmx ext/hash_set_poly.cmi
@@ -118,6 +119,7 @@ ext/ext_topsort.cmi : ext/vec_gen.cmx ext/set_int.cmi ext/int_vec.cmi
 ext/ext_pp_scope.cmi : ext/ident_set.cmi
 ext/ext_io.cmi :
 ext/ext_sexp.cmi :
+ext/ext_json.cmi : ext/string_map.cmi
 ext/ident_hash_set.cmi : ext/hash_set_gen.cmx
 ext/hash_set_poly.cmi :
 ext/ident_hashtbl.cmi : ext/hashtbl_gen.cmx
@@ -592,12 +594,12 @@ ounit_tests/ounit_scc_tests.cmx : ext/string_hashtbl.cmx ounit/oUnit.cmx \
     ext/int_vec_vec.cmx ext/int_vec.cmx ext/ext_string.cmx ext/ext_scc.cmx
 ounit_tests/ounit_hashtbl_tests.cmx : ext/string_hashtbl.cmx ounit/oUnit.cmx
 ounit_tests/ounit_json_tests.cmx : ext/string_map.cmx ounit/oUnit.cmx \
-    bsb/bsb_json.cmx
+    ext/ext_json.cmx
 ounit_tests/ounit_map_tests.cmx : ounit/oUnit.cmx ext/int_map.cmx
 ounit_tests/ounit_ordered_hash_set_tests.cmx : \
     ext/ordered_hash_set_string.cmx ounit/oUnit.cmx ext/ext_util.cmx
 ounit_tests/ounit_vec_test.cmx : ext/set_int.cmx ounit/oUnit.cmx \
-    ext/int_vec.cmx bsb/bsb_json.cmx
+    ext/int_vec.cmx ext/ext_json.cmx
 ounit_tests/ounit_string_tests.cmx : ounit/oUnit.cmx ext/ext_string.cmx
 ounit_tests/ounit_topsort_tests.cmx : ext/set_int.cmx ounit/oUnit.cmx \
     ext/int_vec.cmx ext/ext_topsort.cmx
@@ -616,12 +618,12 @@ ounit_tests/ounit_tests_main.cmx : ext/resize_array.cmx \
     ounit_tests/ounit_tests_main.cmi
 bsb/bsb_build_schemas.cmx :
 bsb/bsb_build_ui.cmx : ext/string_set.cmx ext/string_map.cmx \
-    ext/resize_array.cmx ext/ext_string.cmx ext/ext_filename.cmx \
-    ext/ext_file_pp.cmx bsb/bsb_json.cmx bsb/bsb_dir.cmx \
+    ext/resize_array.cmx ext/ext_string.cmx ext/ext_json.cmx \
+    ext/ext_filename.cmx ext/ext_file_pp.cmx bsb/bsb_dir.cmx \
     bsb/bsb_build_util.cmx bsb/bsb_build_schemas.cmx common/binary_cache.cmx \
     bsb/bsb_build_ui.cmi
-bsb/bsb_build_util.cmx : ext/ext_list.cmx ext/ext_filename.cmx \
-    ext/ext_array.cmx bsb/bsb_json.cmx bsb/bsb_config.cmx \
+bsb/bsb_build_util.cmx : ext/ext_list.cmx ext/ext_json.cmx \
+    ext/ext_filename.cmx ext/ext_array.cmx bsb/bsb_config.cmx \
     bsb/bsb_build_util.cmi
 bsb/bsb_config.cmx : common/js_config.cmx ext/ext_filename.cmx \
     bsb/bsb_config.cmi
@@ -635,25 +637,23 @@ bsb/bsb_gen.cmx : ext/string_map.cmx ext/literals.cmx ext/ext_filename.cmx \
     bsb/bsb_build_ui.cmx common/binary_cache.cmx bsb/bsb_gen.cmi
 bsb/bsb_helper_main.cmx : depends/depends_post_process.cmx \
     bsb/bsb_helper_main.cmi
-bsb/bsb_json.cmx : ext/string_map.cmx ext/ext_array.cmx bsb/bsb_json.cmi
 bsb/bsb_main.cmx : ext/string_vec.cmx ext/literals.cmx ext/ext_string.cmx \
-    ext/ext_filename.cmx ext/ext_file_pp.cmx ext/ext_array.cmx \
-    bsb/bsb_json.cmx bsb/bsb_gen.cmx bsb/bsb_dep_infos.cmx \
+    ext/ext_json.cmx ext/ext_filename.cmx ext/ext_file_pp.cmx \
+    ext/ext_array.cmx bsb/bsb_gen.cmx bsb/bsb_dep_infos.cmx \
     bsb/bsb_default.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
     bsb/bsb_build_ui.cmx bsb/bsb_build_schemas.cmx bsb/bsb_main.cmi
 bsb/bsb_ninja.cmx : ext/string_set.cmx ext/string_map.cmx ext/literals.cmx \
     ext/ext_filename.cmx bsb/bsb_config.cmx bsb/bsb_build_util.cmx \
     bsb/bsb_build_ui.cmx common/binary_cache.cmx bsb/bsb_ninja.cmi
 bsb/bsb_build_ui.cmi : ext/string_set.cmi ext/string_map.cmi \
-    ext/ext_file_pp.cmi bsb/bsb_json.cmi common/binary_cache.cmi
-bsb/bsb_build_util.cmi : bsb/bsb_json.cmi
+    ext/ext_json.cmi ext/ext_file_pp.cmi common/binary_cache.cmi
+bsb/bsb_build_util.cmi : ext/ext_json.cmi
 bsb/bsb_config.cmi :
-bsb/bsb_default.cmi : ext/string_set.cmi bsb/bsb_json.cmi
+bsb/bsb_default.cmi : ext/string_set.cmi ext/ext_json.cmi
 bsb/bsb_dep_infos.cmi :
 bsb/bsb_dir.cmi :
 bsb/bsb_gen.cmi : bsb/bsb_default.cmi bsb/bsb_build_ui.cmi
 bsb/bsb_helper_main.cmi :
-bsb/bsb_json.cmi : ext/string_map.cmi
 bsb/bsb_main.cmi :
 bsb/bsb_ninja.cmi : bsb/bsb_default.cmi bsb/bsb_build_ui.cmi
 jscmj_main.cmx : common/js_config.cmx core/js_cmj_format.cmx \

jscomp/bin/all_ounit_tests.d

@@ -44,8 +44,8 @@ bin/all_ounit_tests.ml : ounit_tests/ounit_hashtbl_tests.ml
 bin/all_ounit_tests.ml : ext/map_gen.ml
 bin/all_ounit_tests.ml : ext/string_map.ml
 bin/all_ounit_tests.ml : ext/string_map.mli
-bin/all_ounit_tests.ml : bsb/bsb_json.ml
-bin/all_ounit_tests.ml : bsb/bsb_json.mli
+bin/all_ounit_tests.ml : ext/ext_json.ml
+bin/all_ounit_tests.ml : ext/ext_json.mli
 bin/all_ounit_tests.ml : ounit_tests/ounit_json_tests.ml
 bin/all_ounit_tests.ml : ext/ext_list.ml
 bin/all_ounit_tests.ml : ext/ext_list.mli

jscomp/bin/all_ounit_tests.ml

@@ -5475,8 +5475,8 @@ let of_array xs =
   Array.fold_left (fun acc (k,v) -> add k v acc) empty xs
 
 end
-module Bsb_json : sig 
-#1 "bsb_json.mli"
+module Ext_json : sig 
+#1 "ext_json.mli"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -5551,7 +5551,7 @@ val test:
 val query : path -> t ->  status
 
 end = struct
-#1 "bsb_json.ml"
+#1 "ext_json.ml"
 # 1 "bsb/bsb_json.mll"
 
 type error =
@@ -6293,9 +6293,9 @@ module Ounit_json_tests
 let ((>::),
     (>:::)) = OUnit.((>::),(>:::))
 
-open Bsb_json
+open Ext_json
 let (|?)  m (key, cb) =
-    m  |> Bsb_json.test key cb 
+    m  |> Ext_json.test key cb 
 
 exception Parse_error 
 let suites = 
@@ -11692,7 +11692,7 @@ module Ounit_vec_test
 let ((>::),
      (>:::)) = OUnit.((>::),(>:::))
 
-open Bsb_json
+open Ext_json
 
 let v = Int_vec.init 10 (fun i -> i);;
 let (=~) x y = OUnit.assert_equal ~cmp:(Int_vec.equal  (fun (x: int) y -> x=y)) x y

jscomp/bin/bsb.d

@@ -20,8 +20,8 @@ bin/bsb.ml : bsb/bsb_config.ml
 bin/bsb.ml : bsb/bsb_config.mli
 bin/bsb.ml : ext/ext_array.ml
 bin/bsb.ml : ext/ext_array.mli
-bin/bsb.ml : bsb/bsb_json.ml
-bin/bsb.ml : bsb/bsb_json.mli
+bin/bsb.ml : ext/ext_json.ml
+bin/bsb.ml : ext/ext_json.mli
 bin/bsb.ml : ext/ext_list.ml
 bin/bsb.ml : ext/ext_list.mli
 bin/bsb.ml : bsb/bsb_build_util.ml

jscomp/bin/bsb.ml

@@ -2891,8 +2891,8 @@ let exists p a =
   loop 0
 
 end
-module Bsb_json : sig 
-#1 "bsb_json.mli"
+module Ext_json : sig 
+#1 "ext_json.mli"
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
  * 
  * This program is free software: you can redistribute it and/or modify
@@ -2967,7 +2967,7 @@ val test:
 val query : path -> t ->  status
 
 end = struct
-#1 "bsb_json.ml"
+#1 "ext_json.ml"
 # 1 "bsb/bsb_json.mll"
 
 type error =
@@ -4264,7 +4264,7 @@ val mkp : string -> unit
 *)
 val get_bsc_bsdep : string -> string * string
 val get_bsc_dir : string -> string                               
-val get_list_string : Bsb_json.t array -> string list
+val get_list_string : Ext_json.t array -> string list
 
 end = struct
 #1 "bsb_build_util.ml"
@@ -4375,7 +4375,7 @@ let rec mkp dir =
 
 
 let get_list_string s = 
-  Ext_array.to_list_map (fun (x : Bsb_json.t) ->
+  Ext_array.to_list_map (fun (x : Ext_json.t) ->
       match x with 
       | `Str x -> Some x.str
       | _ -> None
@@ -6091,14 +6091,14 @@ type t =
 
 
 val parsing_source : 
-  string -> Bsb_json.t String_map.t -> t
+  string -> Ext_json.t String_map.t -> t
 
 (** entry is to the 
     [sources] in the schema
 *)
 val parsing_sources : 
   string -> 
-  Bsb_json.t array ->
+  Ext_json.t array ->
   t 
 
 
@@ -6144,7 +6144,7 @@ type  file_group =
 let (//) = Ext_filename.combine
 
 let (|?)  m (key, cb) =
-  m  |> Bsb_json.test key cb 
+  m  |> Ext_json.test key cb 
 
 let get_list_string  =  Bsb_build_util.get_list_string
 
@@ -6175,7 +6175,7 @@ let print_arrays file_array oc offset  =
 
 
 
-let  handle_list_files dir (s : Bsb_json.t array) loc_start loc_end : Ext_file_pp.interval list * Binary_cache.t =  
+let  handle_list_files dir (s : Ext_json.t array) loc_start loc_end : Ext_file_pp.interval list * Binary_cache.t =  
   if Array.length s  = 0 then 
     begin 
       let files_array = Bsb_dir.readdir dir  in 
@@ -6195,7 +6195,7 @@ let  handle_list_files dir (s : Bsb_json.t array) loc_start loc_end : Ext_file_p
 
   else 
     [],
-    Array.fold_left (fun acc (s : Bsb_json.t) ->
+    Array.fold_left (fun acc (s : Ext_json.t) ->
         match s with 
         | `Str {str = s} -> 
           Binary_cache.map_update ~dir acc s
@@ -6229,7 +6229,7 @@ let empty = { files = []; intervals  = []; globbed_dirs = [];  }
 
 
 
-let rec parsing_source cwd (x : Bsb_json.t String_map.t )
+let rec parsing_source cwd (x : Ext_json.t String_map.t )
   : t =
   let dir = ref cwd in
   let sources = ref String_map.empty in
@@ -6335,7 +6335,7 @@ let rec parsing_source cwd (x : Bsb_json.t String_map.t )
   } 
 
 
-let  parsing_sources cwd (file_groups : Bsb_json.t array)  = 
+let  parsing_sources cwd (file_groups : Ext_json.t array)  = 
   Array.fold_left (fun  origin x ->
       match x with 
       | `Obj map ->  
@@ -6511,16 +6511,16 @@ val get_ocamllex : unit -> string
 val set_ocamllex : cwd:string -> string -> unit
 
 
-val set_bs_external_includes : Bsb_json.t array -> unit
+val set_bs_external_includes : Ext_json.t array -> unit
 val get_bs_external_includes : unit -> string list
 
 
 
 
-val set_bsc_flags : Bsb_json.t array -> unit
+val set_bsc_flags : Ext_json.t array -> unit
 val get_bsc_flags : unit -> string list
 
-val set_ppx_flags : cwd:string -> Bsb_json.t array -> unit
+val set_ppx_flags : cwd:string -> Ext_json.t array -> unit
 val get_ppx_flags : unit -> string list
 
 val set_package_name : string -> unit
@@ -6531,7 +6531,7 @@ val get_refmt : unit -> string
 
 
 val get_bs_dependencies : unit  -> string list
-val set_bs_dependencies : Bsb_json.t array  -> unit
+val set_bs_dependencies : Ext_json.t array  -> unit
 
 
 val get_js_post_build_cmd : unit -> string option
@@ -6542,7 +6542,7 @@ val set_ninja : cwd:string -> string -> unit
 
 type package_specs = String_set.t
 val get_package_specs : unit -> package_specs
-val set_package_specs_from_array : Bsb_json.t array -> unit  
+val set_package_specs_from_array : Ext_json.t array -> unit  
 
 val get_generate_merlin : unit -> bool 
 val set_generate_merlin : bool -> unit 
@@ -7656,7 +7656,7 @@ let bsdeps = ".bsdeps"
 
 (* Key is the path *)
 let (|?)  m (key, cb) =
-  m  |> Bsb_json.test key cb
+  m  |> Ext_json.test key cb
 
 let (//) = Ext_filename.combine
 
@@ -7775,7 +7775,7 @@ let write_ninja_file bsc_dir cwd =
       revise_merlin buffer ;
   in
   let config_json_chan = open_in_bin Literals.bsconfig_json in
-  let global_data = Bsb_json.parse_json_from_chan config_json_chan  in
+  let global_data = Ext_json.parse_json_from_chan config_json_chan  in
 
   let () =
     match global_data with

jscomp/bsb/bsb_build_ui.ml

@@ -38,7 +38,7 @@ type  file_group =
 let (//) = Ext_filename.combine
 
 let (|?)  m (key, cb) =
-  m  |> Bsb_json.test key cb 
+  m  |> Ext_json.test key cb 
 
 let get_list_string  =  Bsb_build_util.get_list_string
 
@@ -69,7 +69,7 @@ let print_arrays file_array oc offset  =
 
 
 
-let  handle_list_files dir (s : Bsb_json.t array) loc_start loc_end : Ext_file_pp.interval list * Binary_cache.t =  
+let  handle_list_files dir (s : Ext_json.t array) loc_start loc_end : Ext_file_pp.interval list * Binary_cache.t =  
   if Array.length s  = 0 then 
     begin 
       let files_array = Bsb_dir.readdir dir  in 
@@ -89,7 +89,7 @@ let  handle_list_files dir (s : Bsb_json.t array) loc_start loc_end : Ext_file_p
 
   else 
     [],
-    Array.fold_left (fun acc (s : Bsb_json.t) ->
+    Array.fold_left (fun acc (s : Ext_json.t) ->
         match s with 
         | `Str {str = s} -> 
           Binary_cache.map_update ~dir acc s
@@ -123,7 +123,7 @@ let empty = { files = []; intervals  = []; globbed_dirs = [];  }
 
 
 
-let rec parsing_source cwd (x : Bsb_json.t String_map.t )
+let rec parsing_source cwd (x : Ext_json.t String_map.t )
   : t =
   let dir = ref cwd in
   let sources = ref String_map.empty in
@@ -229,7 +229,7 @@ let rec parsing_source cwd (x : Bsb_json.t String_map.t )
   } 
 
 
-let  parsing_sources cwd (file_groups : Bsb_json.t array)  = 
+let  parsing_sources cwd (file_groups : Ext_json.t array)  = 
   Array.fold_left (fun  origin x ->
       match x with 
       | `Obj map ->  

jscomp/bsb/bsb_build_ui.mli

@@ -44,13 +44,13 @@ type t =
 
 
 val parsing_source : 
-  string -> Bsb_json.t String_map.t -> t
+  string -> Ext_json.t String_map.t -> t
 
 (** entry is to the 
     [sources] in the schema
 *)
 val parsing_sources : 
   string -> 
-  Bsb_json.t array ->
+  Ext_json.t array ->
   t 
 

jscomp/bsb/bsb_build_util.ml

@@ -105,7 +105,7 @@ let rec mkp dir =
 
 
 let get_list_string s = 
-  Ext_array.to_list_map (fun (x : Bsb_json.t) ->
+  Ext_array.to_list_map (fun (x : Ext_json.t) ->
       match x with 
       | `Str x -> Some x.str
       | _ -> None

jscomp/bsb/bsb_build_util.mli

@@ -64,4 +64,4 @@ val mkp : string -> unit
 *)
 val get_bsc_bsdep : string -> string * string
 val get_bsc_dir : string -> string                               
-val get_list_string : Bsb_json.t array -> string list
+val get_list_string : Ext_json.t array -> string list