Merge pull request #4742 from rescript-lang/cleanup

fix #4718 and clean up

Author: bobzhang

jscomp/bsb/bsb_global_paths.ml

@@ -64,10 +64,3 @@ let vendor_bsdep =
 
 ;; assert (Sys.file_exists bsc_dir)       
 
-let ocaml_version = "4.06.1"
-
-let ocaml_dir =
-  Filename.(concat (concat (dirname bsc_dir) "native") ocaml_version)
-
-let ocaml_lib_dir =
-  Filename.(concat (concat ocaml_dir "lib") "ocaml")

jscomp/bsb/bsb_global_paths.mli

@@ -33,6 +33,3 @@ val vendor_ninja : string
 
 val vendor_bsdep : string
 
-val ocaml_dir : string
-
-val ocaml_lib_dir : string

jscomp/bsb/bsb_ninja_rule.ml

@@ -152,7 +152,8 @@ let make_custom_rules
   in   
   let mk_ast ~(has_pp : bool) ~has_ppx ~has_reason_react_jsx : string =
     Ext_buffer.clear buf ; 
-    Ext_buffer.add_string buf "$bsc  $warnings";
+    Ext_buffer.add_string buf "$bsc  $warnings -bs-v ";
+    Ext_buffer.add_string buf Bs_version.version;
     (match refmt with 
     | None -> ()
     | Some x ->

jscomp/common/ml_binary.ml

@@ -36,7 +36,7 @@ let read_ast (type t ) (kind : t  kind) ic : t  =
     | Mli -> Config.ast_intf_magic_number in 
   let buffer = really_input_string ic (String.length magic) in
   assert(buffer = magic); (* already checked by apply_rewriter *)
-  Location.set_input_name @@ input_value ic;
+  Location.set_input_name (input_value ic);
   input_value ic 
 
 let write_ast (type t) (kind : t kind) 
@@ -54,4 +54,14 @@ let magic_of_kind : type a . a kind -> string = function
   | Ml -> Config.ast_impl_magic_number
   | Mli -> Config.ast_intf_magic_number
 
-  
+
+let read_my_ast (type t ) (_ : t  kind) ic : t  =
+  Location.set_input_name (input_line ic);
+  input_value ic 
+
+let write_my_ast (type t) ( _ : t kind)
+    (fname : string)
+    (pt : t) oc = 
+  output_string oc fname;
+  output_char oc '\n';
+  output_value oc pt

jscomp/common/ml_binary.mli

@@ -24,6 +24,9 @@
 
 
 
+(* This file was used to read reason ast
+  and part of parsing binary ast
+ *)
 type _ kind = 
   | Ml : Parsetree.structure kind 
   | Mli : Parsetree.signature kind
@@ -34,4 +37,16 @@ val read_ast : 'a kind -> in_channel -> 'a
 val write_ast :
    'a kind -> string -> 'a -> out_channel -> unit
 
-val magic_of_kind : 'a kind -> string   
+val magic_of_kind : 'a kind -> string   
+
+val read_my_ast : 
+  'a kind ->
+  in_channel ->
+   'a
+
+val write_my_ast : 
+  'a kind -> 
+   string -> 
+   'a -> 
+   out_channel -> 
+   unit

jscomp/core/js_cmj_format.ml

@@ -72,47 +72,33 @@ let make
   }
 
 
-let verify_magic_in_beg ic =
-  let buffer = really_input_string ic Ext_cmj_magic.cmj_magic_number_length in 
-  if buffer <> Ext_cmj_magic.cmj_magic_number then
-    Ext_fmt.failwithf ~loc:__LOC__ 
-      "cmj files have incompatible versions, please rebuilt using the new compiler : %s" 
-        __LOC__
 
 
 (* Serialization .. *)
 let from_file name : t =
   let ic = open_in_bin name in 
-  verify_magic_in_beg ic ; 
   let _digest = Digest.input ic in 
   let v  : t = input_value ic in 
   close_in ic ;
   v 
 
 let from_file_with_digest name : t * Digest.t =
   let ic = open_in_bin name in 
-  verify_magic_in_beg ic ; 
   let digest = Digest.input ic in 
   let v  : t = input_value ic in 
   close_in ic ;
   v,digest 
 
 
 let from_string s : t = 
-  let magic_number = String.sub s 0 Ext_cmj_magic.cmj_magic_number_length in 
-  if magic_number = Ext_cmj_magic.cmj_magic_number then 
-    Marshal.from_string s  Ext_cmj_magic.header_length
-  else 
-    Ext_fmt.failwithf ~loc:__LOC__ 
-      "cmj files have incompatible versions, please rebuilt using the new compiler : %s"
-        __LOC__
+    Marshal.from_string s  Ext_digest.length
 
 
 let for_sure_not_changed (name : string) (header : string) =   
   if Sys.file_exists name then 
     let ic = open_in_bin name in 
     let holder =
-      really_input_string ic Ext_cmj_magic.header_length in 
+      really_input_string ic Ext_digest.length in 
     close_in ic; 
     holder = header
   else false  
@@ -123,7 +109,7 @@ let for_sure_not_changed (name : string) (header : string) =
 let to_file name ~check_exists (v : t) = 
   let s = Marshal.to_string v [] in 
   let cur_digest = Digest.string s in 
-  let header = Ext_cmj_magic.cmj_magic_number ^ cur_digest in 
+  let header =  cur_digest in 
   if  not (check_exists && for_sure_not_changed name header) then 
     let oc = open_out_bin name in 
     output_string oc header;    

jscomp/depends/binary_ast.ml

@@ -33,7 +33,7 @@ let read_ast (type t ) (kind : t  Ml_binary.kind) fn : t  =
   try
     let dep_size = input_binary_int ic in 
     seek_in  ic (pos_in ic + dep_size) ; 
-    let ast = Ml_binary.read_ast kind ic in 
+    let ast = Ml_binary.read_my_ast kind ic in 
     close_in ic;
     ast
   with exn ->
@@ -59,6 +59,6 @@ let write_ast (type t) ~(sourcefile : string) ~output (kind : t Ml_binary.kind)
     ) output_set ;  
   output_binary_int oc (Ext_buffer.length buf);  
   Ext_buffer.output_buffer oc buf;
-  Ml_binary.write_ast kind sourcefile pt oc;
+  Ml_binary.write_my_ast kind sourcefile pt oc;
   close_out oc 
 

jscomp/ext/ext_cmj_magic.ml

@@ -0,0 +1,13 @@
+current Ast format (10/10/2020)
+
+-- input_binary_int ic (size)
+module,
+module,
+...
+--- seek_in ic (pos_in ic + size)
+fname 
+marshalled ast
+
+
+
+