clean up

Author: bobzhang

jscomp/core/lam.ml

@@ -85,7 +85,7 @@ type primitive =
   | Pjs_call of
       string *  (* prim_name *)
       External_arg_spec.t list * (* arg_types *)
-      External_ffi_types.ffi  (* ffi *)
+      External_ffi_types.attr  (* ffi *)
   | Pjs_object_create of External_ffi_types.obj_create
   (* Exceptions *)
   | Praise

jscomp/core/lam.mli

@@ -82,7 +82,7 @@ type primitive =
     (* Location.t *  [loc] is passed down *)
     string *  (* prim_name *)
     External_arg_spec.t list * (* arg_types *)
-    External_ffi_types.ffi  (* ffi *)
+    External_ffi_types.attr  (* ffi *)
   | Pjs_object_create of External_ffi_types.obj_create
 
   | Praise 

jscomp/core/lam_compile_external_call.ml

@@ -229,10 +229,10 @@ let translate_scoped_access scopes obj =
     List.fold_left (fun acc x -> E.dot acc x) (E.dot obj x) xs 
 
 let translate_ffi 
-    call_loc (ffi : External_ffi_types.ffi ) 
-    (* prim_name *)
+    call_loc 
     (cxt  : Lam_compile_context.t)
     arg_types 
+    (ffi : External_ffi_types.attr ) 
     (args : J.expression list) = 
   match ffi with 
 

jscomp/core/lam_compile_external_call.mli

@@ -37,11 +37,9 @@ val ocaml_to_js_eff :
 
 val translate_ffi :
   Location.t -> 
-  External_ffi_types.ffi -> 
-  (* string -> *) (* Not used.. *)
   Lam_compile_context.t -> 
   External_arg_spec.t list -> 
-  (*bool -> *)
+  External_ffi_types.attr -> 
   J.expression list -> 
   J.expression 
 

jscomp/core/lam_compile_primitive.ml

@@ -681,7 +681,7 @@ let translate  loc
   (*Lam_compile_external_obj.assemble_args_obj labels args *)
   | Pjs_call (_, arg_types, ffi) -> 
     Lam_compile_external_call.translate_ffi 
-      loc ffi cxt arg_types args 
+      loc cxt arg_types ffi args 
   (** FIXME, this can be removed later *)
   | Pisint -> 
     begin 

jscomp/syntax/external_ffi_types.ml

@@ -89,8 +89,7 @@ type arg_label = External_arg_spec.label
 (**TODO: maybe we can merge [arg_label] and [arg_type] *)
 type obj_create = External_arg_spec.t list
 
-type ffi = 
-  (* | Obj_create of obj_create *)
+type attr = 
   | Js_global of js_global_val 
   | Js_module_as_var of  external_module_name
   | Js_module_as_fn of js_module_as_fn
@@ -121,8 +120,6 @@ let name_of_ffi ffi =
   | Js_global v 
     -> 
     Printf.sprintf "[@@bs.val] %S " v.name                    
-(* | Obj_create _ -> 
-   Printf.sprintf "[@@bs.obj]" *)
 
 type return_wrapper = 
   | Return_unset 
@@ -134,8 +131,8 @@ type return_wrapper =
   | Return_replaced_with_unit    
 type t  = 
   | Ffi_bs of External_arg_spec.t list  *
-     return_wrapper * ffi 
-  (**  [Ffi_bs(args,return,ffi) ]
+     return_wrapper * attr 
+  (**  [Ffi_bs(args,return,attr) ]
        [return] means return value is unit or not, 
         [true] means is [unit]  
   *)

jscomp/syntax/external_ffi_types.mli

@@ -89,7 +89,7 @@ type js_set_index = {
 
 
 
-type ffi = 
+type attr  = 
   | Js_global of js_global_val 
   | Js_module_as_var of  external_module_name
   | Js_module_as_fn of js_module_as_fn
@@ -114,15 +114,15 @@ type return_wrapper =
 type t  = 
   | Ffi_bs of 
       External_arg_spec.t list  *
-      return_wrapper * ffi
+      return_wrapper * attr
   | Ffi_obj_create of obj_create
   | Ffi_normal 
   (* When it's normal, it is handled as normal c functional ffi call *)
 
 
-val name_of_ffi : ffi -> string
+val name_of_ffi : attr -> string
 
-val check_ffi : ?loc:Location.t ->  ffi -> unit 
+val check_ffi : ?loc:Location.t ->  attr -> unit 
 
 val to_string : t -> string 
 

jscomp/syntax/external_process.ml

@@ -649,7 +649,7 @@ let handle_attributes
 
          | {val_send_pipe = None ; _ } -> [],[], 0) in 
 
-    let ffi : External_ffi_types.ffi  = match st with           
+    let ffi : External_ffi_types.attr  = match st with           
       | {set_index = true;
 
          val_name = `Nm_na;