add ninja support for codegen

Author: bobzhang

jscomp/bin/all_ounit_tests.ml

@@ -3117,12 +3117,12 @@ end = struct
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-# 42
+# 42 "ext/set.cppo.ml"
 type elt = int 
 let compare_elt = Ext_int.compare 
 let print_elt = Format.pp_print_int
 
-# 49
+# 49 "ext/set.cppo.ml"
 type ('a, 'id) t0 = ('a, 'id) Set_gen.t0 = 
   | Empty 
   | Node of ('a, 'id) t0 * 'a * ('a, 'id) t0 * int 
@@ -6304,7 +6304,7 @@ let key_index (h : _ t ) (key : key) =
   (Bs_hash_stubs.hash_string  key ) land (Array.length h.data - 1)
 let eq_key = Ext_string.equal 
 
-# 33
+# 33 "ext/hashtbl.cppo.ml"
 type ('a, 'b) bucketlist = ('a,'b) Hashtbl_gen.bucketlist
 let create = Hashtbl_gen.create
 let clear = Hashtbl_gen.clear
@@ -8283,12 +8283,12 @@ end = struct
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-# 34
+# 34 "ext/vec.cppo.ml"
 type elt = int 
 let null = 0 (* can be optimized *)
 let unsafe_blit = Bs_hash_stubs.int_unsafe_blit
 
-# 41
+# 41 "ext/vec.cppo.ml"
 external unsafe_sub : 'a array -> int -> int -> 'a array = "caml_array_sub"
 
 type  t = {
@@ -8605,22 +8605,22 @@ let init len f =
     let idx = d_len - 1 in 
     d.len <- idx
 
-# 362
+# 362 "ext/vec.cppo.ml"
 (** pop the last element, a specialized version of [delete] *)
   let pop (d : t) = 
     let idx  = d.len - 1  in
     if idx < 0 then invalid_arg "Resize_array.pop";
     d.len <- idx
 
-# 373
+# 373 "ext/vec.cppo.ml"
 (** pop and return the last element *)  
   let get_last_and_pop (d : t) = 
     let idx  = d.len - 1  in
     if idx < 0 then invalid_arg "Resize_array.get_last_and_pop";
     let last = Array.unsafe_get d.arr idx in 
     d.len <- idx 
 
-# 384
+# 384 "ext/vec.cppo.ml"
     ;
     last 
 
@@ -8632,7 +8632,7 @@ let init len f =
      unsafe_blit arr (idx + len) arr idx (d_len  - idx - len);
     d.len <- d_len - len
 
-# 402
+# 402 "ext/vec.cppo.ml"
 (** delete elements from [idx] with length [len] return the deleted elements as a new vec*)
   let get_and_delete_range (d : t) idx len : t = 
     let d_len = d.len in 
@@ -8642,15 +8642,15 @@ let init len f =
      unsafe_blit arr (idx + len) arr idx (d_len  - idx - len);
     d.len <- d_len - len; 
 
-# 416
+# 416 "ext/vec.cppo.ml"
     {len = len ; arr = value}
 
 
   (** Below are simple wrapper around normal Array operations *)  
 
   let clear (d : t ) =
 
-# 428
+# 428 "ext/vec.cppo.ml"
     d.len <- 0
 
 
@@ -8671,12 +8671,12 @@ let init len f =
     done ;
     let last = !p  in 
 
-# 448
+# 448 "ext/vec.cppo.ml"
     d.len <-  last 
     (* INT , there is not need to reset it, since it will cause GC behavior *)
 
 
-# 454
+# 454 "ext/vec.cppo.ml"
   let inplace_filter_from start f (d : t) : unit = 
     if start < 0 then invalid_arg "Vec.inplace_filter_from"; 
     let d_arr = d.arr in     
@@ -8694,11 +8694,11 @@ let init len f =
     done ;
     let last = !p  in 
 
-# 471
+# 471 "ext/vec.cppo.ml"
     d.len <-  last 
 
 
-# 477
+# 477 "ext/vec.cppo.ml"
 (** inplace filter the elements and accumulate the non-filtered elements *)
   let inplace_filter_with  f ~cb_no acc (d : t)  = 
     let d_arr = d.arr in     
@@ -8719,11 +8719,11 @@ let init len f =
     done ;
     let last = !p  in 
 
-# 497
+# 497 "ext/vec.cppo.ml"
     d.len <-  last 
     (* INT , there is not need to reset it, since it will cause GC behavior *)
 
-# 502
+# 502 "ext/vec.cppo.ml"
     ; !acc 
 
 
@@ -11585,11 +11585,11 @@ end = struct
 
 
 
-# 13
+# 13 "ext/map.cppo.ml"
   type key = int
   let compare_key = Ext_int.compare
 
-# 22
+# 22 "ext/map.cppo.ml"
 type 'a t = (key,'a) Map_gen.t
 exception Duplicate_key of key 
 
@@ -12605,7 +12605,7 @@ end = struct
  * 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. *)
-# 25
+# 25 "ext/vec.cppo.ml"
 external unsafe_blit : 
     'a array -> int -> 'a array -> int -> int -> unit = "caml_array_blit"
 module Make ( Resize :  Vec_gen.ResizeType) = struct
@@ -12614,7 +12614,7 @@ module Make ( Resize :  Vec_gen.ResizeType) = struct
   let null = Resize.null 
 
 
-# 41
+# 41 "ext/vec.cppo.ml"
 external unsafe_sub : 'a array -> int -> int -> 'a array = "caml_array_sub"
 
 type  t = {
@@ -12931,34 +12931,34 @@ let init len f =
     let idx = d_len - 1 in 
     d.len <- idx
 
-# 358
+# 358 "ext/vec.cppo.ml"
     ;
     Array.unsafe_set arr idx  null
 
-# 362
+# 362 "ext/vec.cppo.ml"
 (** pop the last element, a specialized version of [delete] *)
   let pop (d : t) = 
     let idx  = d.len - 1  in
     if idx < 0 then invalid_arg "Resize_array.pop";
     d.len <- idx
 
-# 369
+# 369 "ext/vec.cppo.ml"
     ;    
     Array.unsafe_set d.arr idx null
 
-# 373
+# 373 "ext/vec.cppo.ml"
 (** pop and return the last element *)  
   let get_last_and_pop (d : t) = 
     let idx  = d.len - 1  in
     if idx < 0 then invalid_arg "Resize_array.get_last_and_pop";
     let last = Array.unsafe_get d.arr idx in 
     d.len <- idx 
 
-# 381
+# 381 "ext/vec.cppo.ml"
     ;
     Array.unsafe_set d.arr idx null
 
-# 384
+# 384 "ext/vec.cppo.ml"
     ;
     last 
 
@@ -12970,13 +12970,13 @@ let init len f =
      unsafe_blit arr (idx + len) arr idx (d_len  - idx - len);
     d.len <- d_len - len
 
-# 396
+# 396 "ext/vec.cppo.ml"
     ;
     for i = d_len - len to d_len - 1 do
       Array.unsafe_set arr i null
     done
 
-# 402
+# 402 "ext/vec.cppo.ml"
 (** delete elements from [idx] with length [len] return the deleted elements as a new vec*)
   let get_and_delete_range (d : t) idx len : t = 
     let d_len = d.len in 
@@ -12986,25 +12986,25 @@ let init len f =
      unsafe_blit arr (idx + len) arr idx (d_len  - idx - len);
     d.len <- d_len - len; 
 
-# 412
+# 412 "ext/vec.cppo.ml"
     for i = d_len - len to d_len - 1 do
       Array.unsafe_set arr i null
     done;
 
-# 416
+# 416 "ext/vec.cppo.ml"
     {len = len ; arr = value}
 
 
   (** Below are simple wrapper around normal Array operations *)  
 
   let clear (d : t ) =
 
-# 424
+# 424 "ext/vec.cppo.ml"
     for i = 0 to d.len - 1 do 
       Array.unsafe_set d.arr i null
     done;
 
-# 428
+# 428 "ext/vec.cppo.ml"
     d.len <- 0
 
 
@@ -13025,11 +13025,11 @@ let init len f =
     done ;
     let last = !p  in 
 
-# 451
+# 451 "ext/vec.cppo.ml"
     delete_range d last  (d_len - last)
 
 
-# 454
+# 454 "ext/vec.cppo.ml"
   let inplace_filter_from start f (d : t) : unit = 
     if start < 0 then invalid_arg "Vec.inplace_filter_from"; 
     let d_arr = d.arr in     
@@ -13047,11 +13047,11 @@ let init len f =
     done ;
     let last = !p  in 
 
-# 473
+# 473 "ext/vec.cppo.ml"
     delete_range d last  (d_len - last)
 
 
-# 477
+# 477 "ext/vec.cppo.ml"
 (** inplace filter the elements and accumulate the non-filtered elements *)
   let inplace_filter_with  f ~cb_no acc (d : t)  = 
     let d_arr = d.arr in     
@@ -13072,15 +13072,15 @@ let init len f =
     done ;
     let last = !p  in 
 
-# 500
+# 500 "ext/vec.cppo.ml"
     delete_range d last  (d_len - last)
 
-# 502
+# 502 "ext/vec.cppo.ml"
     ; !acc 
 
 
 
-# 507
+# 507 "ext/vec.cppo.ml"
 end
 
 end

jscomp/bin/bspack.ml

@@ -8299,7 +8299,7 @@ let key_index (h : _ t ) (key : key) =
   (Bs_hash_stubs.hash_string  key ) land (Array.length h.data - 1)
 let eq_key = Ext_string.equal 
 
-# 33
+# 33 "ext/hashtbl.cppo.ml"
 type ('a, 'b) bucketlist = ('a,'b) Hashtbl_gen.bucketlist
 let create = Hashtbl_gen.create
 let clear = Hashtbl_gen.clear

jscomp/compiler.ninja

@@ -49,6 +49,47 @@ rule bspack
     generator = true
 build ./bin/tests.exe: link ounit/ounit.cmxa stubs/stubs.cmxa ext/ext.cmxa common/common.cmxa syntax/syntax.cmxa depends/depends.cmxa bsb/bsb.cmxa core/core.cmxa ounit_tests/ounit_tests.cmxa main/ounit_tests_main.cmx
     libs = str.cmxa unix.cmxa ocamlcommon.cmxa
+rule cppo    
+    command = cppo -D $type $in -o $out
+    generator = true
+build ext/string_hash_set.ml : cppo ext/hash_set.cppo.ml
+    type = TYPE_STRING
+build ext/int_hash_set.ml : cppo ext/hash_set.cppo.ml
+    type = TYPE_INT
+build ext/ident_hash_set.ml : cppo ext/hash_set.cppo.ml
+    type = TYPE_IDENT
+build ext/hash_set.ml : cppo ext/hash_set.cppo.ml
+    type = TYPE_FUNCTOR
+build ext/hash_set_poly.ml : cppo ext/hash_set.cppo.ml
+    type = TYPE_POLY
+build ext/int_vec.ml : cppo ext/vec.cppo.ml
+    type = TYPE_INT
+build ext/resize_array.ml : cppo ext/vec.cppo.ml
+    type = TYPE_FUNCTOR
+build ext/string_set.ml : cppo ext/set.cppo.ml
+    type = TYPE_STRING
+build ext/set_int.ml : cppo ext/set.cppo.ml
+    type = TYPE_INT
+build ext/ident_set.ml : cppo ext/set.cppo.ml
+    type = TYPE_IDENT
+build ext/string_map.ml : cppo ext/map.cppo.ml
+    type = TYPE_STRING
+build ext/int_map.ml : cppo ext/map.cppo.ml
+    type = TYPE_INT
+build ext/ident_map.ml : cppo ext/map.cppo.ml
+    type = TYPE_IDENT
+build ext/ordered_hash_map_local_ident.ml : cppo ext/ordered_hash_map.cppo.ml
+    type = TYPE_LOCAL_IDENT
+build ext/ordered_hash_set_make.ml : cppo ext/ordered_hash_set.cppo.ml
+    type = TYPE_FUNCTOR
+build ext/string_hashtbl.ml : cppo ext/hashtbl.cppo.ml
+    type = TYPE_STRING
+build ext/int_hashtbl.ml : cppo ext/hashtbl.cppo.ml
+    type = TYPE_INT
+build ext/ident_hashtbl.ml : cppo ext/hashtbl.cppo.ml
+    type = TYPE_IDENT
+build ext/hashtbl_make.ml : cppo ext/hashtbl.cppo.ml
+    type = TYPE_FUNCTOR    
 build stubs/bs_hash_stubs.cmx stubs/bs_hash_stubs.cmi : optc stubs/bs_hash_stubs.ml | 
 build ext/ext_array.cmx : optc ext/ext_array.ml | ext/ext_array.cmi
 build ext/ext_array.cmi : optc ext/ext_array.mli | 

jscomp/ext/hashtbl_make.ml

@@ -7,7 +7,7 @@ module Make (Key : Hashtbl.HashedType) = struct
   let eq_key = Key.equal   
 
 
-# 33
+# 33 "ext/hashtbl.cppo.ml"
 type ('a, 'b) bucketlist = ('a,'b) Hashtbl_gen.bucketlist
 let create = Hashtbl_gen.create
 let clear = Hashtbl_gen.clear
@@ -135,5 +135,5 @@ let of_list2 ks vs =
   List.iter2 (fun k v -> add map k v) ks vs ; 
   map
 
-# 161
+# 161 "ext/hashtbl.cppo.ml"
 end

jscomp/ext/ident_hashtbl.ml

@@ -6,7 +6,7 @@ let key_index (h : _ t ) (key : key) =
 (* (Bs_hash_stubs.hash_string_int  key.name key.stamp ) land (Array.length h.data - 1) *)
 let eq_key = Ext_ident.equal 
 
-# 33
+# 33 "ext/hashtbl.cppo.ml"
 type ('a, 'b) bucketlist = ('a,'b) Hashtbl_gen.bucketlist
 let create = Hashtbl_gen.create
 let clear = Hashtbl_gen.clear

jscomp/ext/ident_map.ml

@@ -4,11 +4,11 @@
 
 
 
-# 16
+# 16 "ext/map.cppo.ml"
   type key = Ident.t
   let compare_key = Ext_ident.compare
 
-# 22
+# 22 "ext/map.cppo.ml"
 type 'a t = (key,'a) Map_gen.t
 exception Duplicate_key of key