Merge pull request #4580 from BuckleScript/ffi_clean_up2

continue ffi clean up, remove some intermediate allocation

Author: bobzhang

jscomp/core/js_of_lam_variant.ml

@@ -31,7 +31,7 @@ type arg_expression =
   | Splice2 of E.t * E.t
 
 (* we need destruct [undefined] when input is optional *)
-let eval (arg : J.expression) (dispatches : (Ast_compatible.hash_label * string) list ) : E.t =
+let eval (arg : J.expression) (dispatches : (string * string) list ) : E.t =
   if arg == E.undefined then E.undefined 
   else
     match arg.expression_desc with
@@ -51,7 +51,7 @@ let eval (arg : J.expression) (dispatches : (Ast_compatible.hash_label * string)
 
 (** invariant: optional is not allowed in this case *)
 (** arg is a polyvar *)
-let eval_as_event (arg : J.expression) (dispatches : (Ast_compatible.hash_label * string) list option) =
+let eval_as_event (arg : J.expression) (dispatches : (string * string) list option) =
   match arg.expression_desc with
   | Caml_block([{expression_desc = Str(_,s)}; cb], _, _, Blk_poly_var ) when Js_analyzer.no_side_effect_expression cb 
     -> 
@@ -94,7 +94,7 @@ let eval_as_event (arg : J.expression) (dispatches : (Ast_compatible.hash_label
       *)
 
 (* we need destruct [undefined] when input is optional *)
-let eval_as_int (arg : J.expression) (dispatches : (Ast_compatible.hash_label * int) list ) : E.t  =
+let eval_as_int (arg : J.expression) (dispatches : (string * int) list ) : E.t  =
   if arg == E.undefined then E.undefined else
   match arg.expression_desc with
   | Str(_,i) ->

jscomp/core/js_of_lam_variant.mli

@@ -31,17 +31,17 @@ type arg_expression =
 
 val eval :
    J.expression -> 
-   (Ast_compatible.hash_label * string) list
+   (string * string) list
    -> J.expression
 
 val eval_as_event : 
   J.expression -> 
-  (Ast_compatible.hash_label * string) list option 
+  (string * string) list option 
   -> arg_expression
 
 val eval_as_int : 
   J.expression -> 
-  (Ast_compatible.hash_label * int) list -> 
+  (string * int) list -> 
   J.expression
 
 val eval_as_unwrap : J.expression -> J.expression

jscomp/syntax/ast_compatible.ml

@@ -28,7 +28,6 @@ open Parsetree
 let default_loc = Location.none
 
 
-type poly_var_label = Asttypes.label Asttypes.loc
 
 
 
@@ -37,8 +36,9 @@ type poly_var_label = Asttypes.label Asttypes.loc
 
 
 
-let arrow ?(loc=default_loc) ?(attrs = []) a b  =
-  Ast_helper.Typ.arrow ~loc ~attrs Nolabel a b  
+
+let arrow ?loc ?attrs a b  =
+  Ast_helper.Typ.arrow ?loc ?attrs Nolabel a b  
 
 let apply_simple
  ?(loc = default_loc) 
@@ -105,21 +105,6 @@ let fun_
     pexp_desc = Pexp_fun(Nolabel,None, pat, exp)
   }
 
-(* let opt_label s =
-  Asttypes.Optional s *)
-
-(* let label_fun
-  ?(loc = default_loc)
-  ?(attrs = [])
-  ~label
-  pat
-  exp =
-  {
-    pexp_loc = loc;
-    pexp_attributes = attrs;
-    pexp_desc = Pexp_fun(label, None, pat, exp)
-  } *)
-type hash_label = string 
 
 
 let const_exp_string 
@@ -133,15 +118,7 @@ let const_exp_string
     pexp_desc = Pexp_constant(Pconst_string(s,delimiter))
   }
 
-let const_hash_label 
-    ?(loc = default_loc)
-    ?(attrs = [])
-    (s : hash_label) : expression = 
-  {
-    pexp_loc = loc; 
-    pexp_attributes = attrs;
-    pexp_desc = Pexp_constant(Pconst_string(s,None))
-  }
+
 
 let const_exp_int 
   ?(loc = default_loc)
@@ -165,19 +142,6 @@ let apply_labels
         fn, 
         Ext_list.map args (fun (l,a) -> Asttypes.Labelled l, a)   ) }
 
-let object_ 
-  ?(loc= default_loc)
-  ?(attrs = [])
-  (fields : (Asttypes.label Asttypes.loc * attributes * core_type) list)
-  flg : core_type = 
-  {
-    ptyp_desc = 
-      Ptyp_object(
-        Ext_list.map fields (fun (a,b,c) -> 
-          Parsetree.Otag (a,b,c)),flg);
-    ptyp_loc = loc;
-    ptyp_attributes = attrs
-  }
 
 
 

jscomp/syntax/ast_compatible.mli

@@ -23,7 +23,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
 
-type poly_var_label = Asttypes.label Asttypes.loc
+
 
 
 
@@ -33,7 +33,7 @@ type poly_var_label = Asttypes.label Asttypes.loc
 
 type loc = Location.t 
 type attrs = Parsetree.attribute list 
-type hash_label = string 
+
 open Parsetree
 
 
@@ -50,20 +50,13 @@ val const_exp_int:
   int -> 
   expression 
 
-val const_hash_label : 
-  ?loc:Location.t -> 
-  ?attrs:attrs -> 
-  string -> 
-  expression 
 
 
 val const_exp_int_list_as_array:  
   int list -> 
   expression 
 
-(* val const_exp_string_list_as_array:  
-  string list -> 
-  expression  *)
+
 
 
 val apply_simple:
@@ -150,12 +143,6 @@ val opt_arrow:
   core_type ->
   core_type
 
-val object_: 
-  ?loc:loc -> 
-  ?attrs:attrs ->
-  (string Asttypes.loc * attributes * core_type) list -> 
-  Asttypes.closed_flag ->
-  core_type  
 
 
 (* val nonrec_type_str:  

jscomp/syntax/ast_core_type.ml

@@ -104,8 +104,9 @@ let from_labels ~loc arity labels
          Typ.var ~loc ("a" ^ string_of_int i)))) in
   let result_type =
     Ast_comb.to_js_type loc
-      (Ast_compatible.object_ ~loc
-         (Ext_list.map2 labels tyvars (fun x y -> x ,[], y)) Closed)
+      (Typ.object_ ~loc
+         (Ext_list.map2 labels tyvars 
+          (fun x y -> Parsetree.Otag (x ,[], y))) Closed)
   in
   Ext_list.fold_right2 labels tyvars  result_type
     (fun label (* {loc ; txt = label }*)
@@ -115,7 +116,7 @@ let from_labels ~loc arity labels
 
 let make_obj ~loc xs =
   Ast_comb.to_js_type loc
-    (Ast_compatible.object_  ~loc xs Closed)
+    (Typ.object_  ~loc xs Closed)
 
 
 

jscomp/syntax/ast_core_type.mli

@@ -47,7 +47,7 @@ val from_labels :
 
 val make_obj :
   loc:Location.t ->
-  (string Asttypes.loc * Parsetree.attributes * t) list ->
+  Parsetree.object_field list ->
   t
 
 val is_user_option : t -> bool

jscomp/syntax/ast_derive_js_mapper.ml

@@ -435,10 +435,10 @@ let init () =
 
                   let objType flag =                     
                     Ast_comb.to_js_type loc @@  
-                    Ast_compatible.object_
+                    Typ.object_
                       (Ext_list.map label_declarations
                          (fun {pld_name ; pld_type } -> 
-                            pld_name, [], pld_type)) 
+                            Parsetree.Otag(pld_name, [], pld_type))) 
                       flag in                   
                   newTypeStr +? 
                   [

jscomp/syntax/ast_external_process.ml

@@ -400,7 +400,7 @@ let process_obj
   } ->
     if String.length prim_name <> 0 then
       Location.raise_errorf ~loc "[@@bs.obj] expect external names to be empty string";
-    let arg_kinds, new_arg_types_ty, result_types =
+    let arg_kinds, new_arg_types_ty, (result_types : Parsetree.object_field list) =
       Ext_list.fold_right arg_types_ty ( [], [], [])
         (fun param_type ( arg_labels, (arg_types : Ast_compatible.param_type list), result_types) ->
            let arg_label = param_type.label in
@@ -426,22 +426,22 @@ let process_obj
                    {obj_arg_label = External_arg_spec.obj_label s;
                     obj_arg_type },
                    arg_types, (* ignored in [arg_types], reserved in [result_types] *)
-                   (({Asttypes.txt = name; loc} , [], new_ty) :: result_types)
+                   (Parsetree.Otag({Asttypes.txt = name; loc} , [], new_ty) :: result_types)
                  | Nothing  ->
                    let s = (Lam_methname.translate  name) in
                    {obj_arg_label = External_arg_spec.obj_label s ; obj_arg_type },
                    {param_type with ty = new_ty}::arg_types,
-                   (({Asttypes.txt = name; loc} , [], new_ty) :: result_types)
+                   (Otag ({Asttypes.txt = name; loc} , [], new_ty) :: result_types)
                  | Int _  ->
                    let s = Lam_methname.translate  name in
                    {obj_arg_label = External_arg_spec.obj_label s; obj_arg_type},
                    {param_type with ty = new_ty}::arg_types,
-                   (({Asttypes.txt = name; loc}, [], Ast_literal.type_int ~loc ()) :: result_types)
+                   (Otag ({Asttypes.txt = name; loc}, [], Ast_literal.type_int ~loc ()) :: result_types)
                  | Poly_var_string _ ->
                    let s = Lam_methname.translate  name in
                    {obj_arg_label = External_arg_spec.obj_label s; obj_arg_type},
                    {param_type with ty = new_ty }::arg_types,
-                   (({Asttypes.txt = name; loc}, [], Ast_literal.type_string ~loc ()) :: result_types)
+                   (Otag({Asttypes.txt = name; loc}, [], Ast_literal.type_string ~loc ()) :: result_types)
                  | Fn_uncurry_arity _ ->
                    Location.raise_errorf ~loc
                      "The combination of [@@bs.obj], [@@bs.uncurry] is not supported yet"
@@ -464,17 +464,17 @@ let process_obj
                    let s = (Lam_methname.translate  name) in
                    {obj_arg_label = External_arg_spec.optional s; obj_arg_type},
                    param_type :: arg_types,
-                   ( ({Asttypes.txt = name; loc}, [], Ast_comb.to_undefined_type loc ty) ::  result_types)
+                   ( Parsetree.Otag ({Asttypes.txt = name; loc}, [], Ast_comb.to_undefined_type loc ty) ::  result_types)
                  | Int _  ->
                    let s = Lam_methname.translate  name in
                    {obj_arg_label = External_arg_spec.optional s ; obj_arg_type },
                    param_type :: arg_types,
-                   (({Asttypes.txt = name; loc}, [], Ast_comb.to_undefined_type loc @@ Ast_literal.type_int ~loc ()) :: result_types)
+                   (Otag ({Asttypes.txt = name; loc}, [], Ast_comb.to_undefined_type loc @@ Ast_literal.type_int ~loc ()) :: result_types)
                  | Poly_var_string _ ->
                    let s = Lam_methname.translate  name in
                    {obj_arg_label = External_arg_spec.optional s ; obj_arg_type },
                    param_type::arg_types,
-                   (({Asttypes.txt = name; loc}, [], Ast_comb.to_undefined_type loc @@ Ast_literal.type_string ~loc ()) :: result_types)
+                   (Otag ({Asttypes.txt = name; loc}, [], Ast_comb.to_undefined_type loc @@ Ast_literal.type_string ~loc ()) :: result_types)
                  | Arg_cst _
                    ->
                    Location.raise_errorf ~loc "bs.as is not supported with optional yet"

jscomp/syntax/ast_polyvar.mli

@@ -26,7 +26,7 @@
 val map_row_fields_into_ints:
   Location.t -> 
   Parsetree.row_field list -> 
-  (Ast_compatible.hash_label * int ) list 
+  (string * int ) list 
 
 val map_constructor_declarations_into_ints:
   Parsetree.constructor_declaration list ->

jscomp/syntax/ast_util.ml

@@ -66,10 +66,10 @@ let ocaml_obj_as_js_object
 
     let result = Typ.var ~loc val_name.txt in 
     result , 
-    ((val_name , [], result ) ::
+    (Parsetree.Otag (val_name , [], result ) ::
      (if is_mutable then 
-        [{val_name with txt = val_name.txt ^ Literals.setter_suffix},[],
-         Ast_typ_uncurry.to_method_type loc mapper Nolabel result (Ast_literal.type_unit ~loc ()) ]
+        [ Otag ({val_name with txt = val_name.txt ^ Literals.setter_suffix},[],
+         Ast_typ_uncurry.to_method_type loc mapper Nolabel result (Ast_literal.type_unit ~loc ())) ]
       else 
         []) )
   in 
@@ -84,7 +84,8 @@ let ocaml_obj_as_js_object
       for public object type its [@bs.meth] it does not depend on itself
       while for label argument it is [@bs.this] which depends internal object
   *)
-  let internal_label_attr_types, public_label_attr_types  = 
+  let (internal_label_attr_types : Parsetree.object_field list), 
+      (public_label_attr_types : Parsetree.object_field list) = 
     Ext_list.fold_right clfs ([], []) 
       (fun ({pcf_loc  = loc} as x  : Parsetree.class_field) 
         (label_attr_types, public_label_attr_types) ->
@@ -102,9 +103,9 @@ let ocaml_obj_as_js_object
               ->  
               let method_type =
                 Ast_typ_uncurry.generate_arg_type x.pcf_loc mapper label.txt lbl pat e in 
-              ((label, [], method_type) :: label_attr_types),
+              (Parsetree.Otag(label, [], method_type) :: label_attr_types),
               (if public_flag = Public then
-                 (label, [], method_type) :: public_label_attr_types
+                 Parsetree.Otag (label, [], method_type) :: public_label_attr_types
                else 
                  public_label_attr_types)