Merge pull request rescript-lang#5166 from rescript-lang/embedding

Author: bobzhang

jscomp/bsb/bsb_config_parse.ml

@@ -290,7 +290,7 @@ let interpret_json
 
   : Bsb_config_types.t =
 
-  (** we should not resolve it too early,
+  (* we should not resolve it too early,
       since it is external configuration, no {!Bsb_build_util.convert_and_resolve_path}
   *)
 
@@ -377,7 +377,7 @@ let interpret_json
           files_to_install = Queue.create ();
           built_in_dependency = built_in_package;
           generate_merlin = 
-            extract_boolean map Bsb_build_schemas.generate_merlin true;
+            extract_boolean map Bsb_build_schemas.generate_merlin false;
           reason_react_jsx  ;  
           generators = extract_generators map ; 
           cut_generators ;

jscomp/bsb/bsb_file_groups.ml

@@ -77,6 +77,7 @@ let cons ~file_group ?globbed_dir (v : t) : t =
       | None -> v.globbed_dirs
       | Some f -> f :: v.globbed_dirs
   }
+  
 (** when [is_empty file_group]
     we don't need issue [-I] [-S] in [.merlin] file
 *)  

jscomp/bsb/bsb_merlin_gen.ml

@@ -182,7 +182,7 @@ let merlin_file_gen ~per_proj_dir:(per_proj_dir:string)
         Buffer.add_string buffer merlin_b;
         Buffer.add_string buffer path ;
       );
-    Ext_list.iter bs_dev_dependencies (**TODO: shall we generate .merlin for dev packages ?*)
+    Ext_list.iter bs_dev_dependencies (*TODO: shall we generate .merlin for dev packages ?*)
       (fun package ->    
          let path = package.package_install_path in
          Buffer.add_string buffer merlin_s ;

jscomp/bsb/bsb_namespace_map_gen.ml

@@ -34,7 +34,7 @@ let write_file fname digest contents =
   output_char oc '\n';
   Ext_buffer.output_buffer oc contents;
   close_out oc 
-(** 
+(*
    TODO:
    sort filegroupts to ensure deterministic behavior
 

jscomp/bsb/bsb_ninja_gen.ml

@@ -268,7 +268,7 @@ let output_ninja_and_namespace_map
    | None -> ()
    | Some x -> output_string oc ("cleaner = " ^ x.path ^ "\n"));   
   output_static_resources static_resources rules.copy_resources oc ;
-  (** Generate build statement for each file *)        
+  (* Generate build statement for each file *)        
   Ext_list.iter bs_file_groups 
     (fun files_per_dir ->
        Bsb_ninja_file_groups.handle_files_per_dir oc  

jscomp/bsb/bsb_ninja_rule.ml

@@ -91,11 +91,11 @@ type builtin = {
   (* build_ast_from_rei : t ; *)
 
 
-  (** platform dependent, on Win32,
+  (* platform dependent, on Win32,
       invoking cmd.exe
   *)
   copy_resources : t;
-  (** Rules below all need restat *)
+  (* Rules below all need restat *)
   build_bin_deps : t ;
   build_bin_deps_dev : t;        
   mj : t;
@@ -134,7 +134,7 @@ let make_custom_rules
   builtin = 
   let bs_dep = Ext_filename.maybe_quote Bsb_global_paths.vendor_bsdep in
   let bsc = Ext_filename.maybe_quote Bsb_global_paths.vendor_bsc in 
-  (** FIXME: We don't need set [-o ${out}] when building ast 
+  (* FIXME: We don't need set [-o ${out}] when building ast 
       since the default is already good -- it does not*)
   let buf = Ext_buffer.create 100 in     
   let ns_flag = 
@@ -293,11 +293,11 @@ let make_custom_rules
   {
     build_ast ;
     build_ast_from_re  ;
-    (** platform dependent, on Win32,
+    (* platform dependent, on Win32,
         invoking cmd.exe
     *)
     copy_resources;
-    (** Rules below all need restat *)
+    (* Rules below all need restat *)
     build_bin_deps ;
     build_bin_deps_dev;
     mj  ;

jscomp/bsb/bsb_ninja_rule.mli

@@ -39,11 +39,11 @@ type builtin = {
   build_ast : t;
   build_ast_from_re : t ;
 
-  (** platform dependent, on Win32,
+  (* platform dependent, on Win32,
       invoking cmd.exe
   *)
   copy_resources : t;
-  (** Rules below all need restat *)
+  (* Rules below all need restat *)
   build_bin_deps : t ;
   build_bin_deps_dev : t ;
   mj : t;
@@ -65,7 +65,7 @@ type builtin = {
 *)
 
 type command = string
-(** Since now we generate ninja files per bsconfig.json in a single process, 
+(* Since now we generate ninja files per bsconfig.json in a single process, 
     we must make sure it is re-entrant
 *)
 val make_custom_rules : 

jscomp/bsb/bsb_parse_sources.ml

@@ -209,7 +209,7 @@ let rec
     let sources = 
       match input.?(Bsb_build_schemas.files) with 
       | None ->  
-        (** We should avoid temporary files *)
+        (* We should avoid temporary files *)
         Ext_array.fold_left (Lazy.force base_name_array) output_sources (fun acc basename -> 
             if is_input_or_output scanned_generators basename then acc 
             else 
@@ -233,7 +233,7 @@ let rec
     in 
     let resources = extract_resources input in
     let public = extract_pub input sources in 
-    (** Doing recursive stuff *)  
+    (* Doing recursive stuff *)  
     let children =     
       match sub_dirs_field, 
             cxt.traverse with 
@@ -259,7 +259,7 @@ let rec
       | Some (False _), _  -> Bsb_file_groups.empty
       | Some s, _  -> parse_sources cxt s 
     in 
-    (** Do some clean up *)  
+    (* Do some clean up *)  
     (* prune_staled_bs_js_files cxt sources ; *)
     Bsb_file_groups.cons 
       ~file_group:{ dir ; 

jscomp/bsb/bsb_pkg.ml

@@ -38,6 +38,7 @@ let node_paths : string list Lazy.t =
   lazy (try Ext_string.split (Sys.getenv "NODE_PATH")
               (if Sys.win32 then ';' else ':')   
         with _ -> [])
+        
 (** It makes sense to have this function raise, when [bsb] could not resolve a package, it used to mean
     a failure
 *)

jscomp/bsb/bsb_warning.ml

@@ -82,7 +82,7 @@ let from_map (m : Ext_json_types.t Map_string.t) =
         -> Warn_error_number str
       | Some x -> Bsb_exception.config_error x "expect true/false or string"
       | None -> Warn_error_false
-      (** To make it less intrusive : warning error has to be enabled*)
+      (* To make it less intrusive : warning error has to be enabled*)
     in
     let number =
       match number_opt with

jscomp/bspp/parser.ml

@@ -16,5 +16,6 @@
     "number" : "-40+6+7",
     "error" : true
   },
-  "suffix": ".bs.js"
+  "suffix": ".bs.js",
+  "generate-merlin": true
 }

jscomp/build_tests/custom_namespace/bsconfig.json

@@ -19,5 +19,6 @@
     "number" : "-40+6+7",
     "error" : true
   },
-  "suffix": ".bs.js"
+  "suffix": ".bs.js",
+  "generate-merlin": true
 }

jscomp/build_tests/namespace/bsconfig.json

@@ -0,0 +1 @@
+../ocaml/bytecomp

jscomp/bytecomp

@@ -64,7 +64,7 @@ let free_variables (stats : idents_stats) = {
   expression = begin fun self exp -> 
     match exp.expression_desc with
     | Fun(_, _,_, env)
-      (** a optimization to avoid walking into funciton again
+      (* a optimization to avoid walking into funciton again
           if it's already comuted
       *)
       ->
@@ -111,7 +111,7 @@ let rec no_side_effect_expression_desc (x : J.expression_desc)  =
   | Array (xs,_mutable_flag)  
   | Caml_block (xs, _mutable_flag, _, _)
     ->
-    (** create [immutable] block,
+    (* create [immutable] block,
         does not really mean that this opreation itself is [pure].
 
         the block is mutable does not mean this operation is non-pure

jscomp/core/js_analyzer.ml

@@ -49,7 +49,7 @@ let load_unit_with_file unit_name : Js_cmj_format.cmj_load_info =
   | Some f
     -> 
     {package_path = 
-       (** hacking relying on the convention of pkg/lib/ocaml/xx.cmj*)
+       (* hacking relying on the convention of pkg/lib/ocaml/xx.cmj*)
        Filename.dirname (Filename.dirname (Filename.dirname f)); 
      cmj_table =  Js_cmj_format.from_file f}
   | None -> 

jscomp/core/js_cmj_load.ml

@@ -373,7 +373,7 @@ and  pp_function ~is_method
        optimize len ~p:(arity = NA && len <=8) cxt f v)
 
   | _  ->
-    let set_env : Set_ident.t = (** identifiers will be printed following*)
+    let set_env : Set_ident.t = (* identifiers will be printed following*)
       match fn_state with
       | Is_return
       | No_name _ ->
@@ -730,7 +730,7 @@ and expression_desc cxt ~(level:int) f x : cxt  =
        handle parens..
     *)
     ->
-    (** TODO: parenthesize when necessary *)
+    (* TODO: parenthesize when necessary *)
     (match delta, op with
      | {expression_desc = Number (Int { i =  1l; _})}, Plus
      | {expression_desc = Number (Int { i =  -1l; _})}, Minus
@@ -789,7 +789,7 @@ and expression_desc cxt ~(level:int) f x : cxt  =
         P.space f;
         expression  ~level:rght cxt   f e2)
   | Array (el,_) ->
-    (** TODO: simplify for singleton list *)
+    (* TODO: simplify for singleton list *)
     (match el with
      | []| [ _ ] -> P.bracket_group f 1 (fun _ -> array_element_list  cxt f el)
      | _ -> P.bracket_vgroup f 1 (fun _ -> array_element_list  cxt f el))
@@ -892,7 +892,7 @@ and expression_desc cxt ~(level:int) f x : cxt  =
         cxt) 
 
   | Length (e, _) ->
-    (** Todo: check parens *)
+    (*Todo: check parens *)
     P.cond_paren_group f (level > 15) 1 (fun _ -> 
         let cxt = expression ~level:15 cxt f e in
         P.string f L.dot;

jscomp/core/js_dump.ml

@@ -639,7 +639,7 @@ let bin ?comment (op : J.binop) (e0 : t) (e1 : t) : t =
   match op, e0.expression_desc, e1.expression_desc with
   | EqEqEq,_,_ -> triple_equal ?comment e0 e1
   | Ge, Length (e,_), Number (Int {i = 0l}) when no_side_effect e -> 
-    true_ (** x.length >=0 | [x] is pure  -> true*)
+    true_ (* x.length >=0 | [x] is pure  -> true*)
   | Gt, Length (_,_), Number (Int {i = 0l}) -> 
     (* [e] is kept so no side effect check needed *)
     {expression_desc = Bin(NotEqEq,e0, e1); comment }