bs.variadic and bs.send transition

Author: bobzhang

jscomp/core/lam.ml

@@ -287,8 +287,8 @@ exception Not_simple_form
  where [wrap] used to be simple instructions
  Note that [external] functions are forced to do eta-conversion
  when combined with [|>] operator, we need to make sure beta-reduction
- is applied though since `[@bs.splice]` needs such guarantee.
- Since `[@bs.splice] is the tail position
+ is applied though since `[@variadic]` needs such guarantee.
+ Since `[@variadic] is the tail position
 *)
 let rec is_eta_conversion_exn
  params inner_args outer_args : t list =

jscomp/core/lam_compile_external_call.mli

@@ -45,5 +45,5 @@ val translate_ffi :
 
 (** TODO: document supported attributes
  Attributes starting with `js` are reserved
- examples: "bs.splice"
+ examples: "variadic"
  *)

jscomp/core/lam_convert.ml

@@ -904,15 +904,15 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) : Lam.t * Lam_module_i
  ]}
  is also wrong.
 
- It seems, we need handle [@bs.splice] earlier
+ It seems, we need handle [@variadic] earlier
 
  or
  {[
  (fun x y -> f x y) ([|1;2;3|]) -->
  let x0, x1, x2 =1,2,3 in
  (fun y -> f [|x0;x1;x2|] y)
  ]}
- But this still need us to know [@bs.splice] in advance
+ But this still need us to know [@variadic] in advance
 
 
  we should not remove it immediately, since we have to be careful

jscomp/reserved_attributs.md

@@ -6,15 +6,15 @@ to detect unused attributes in the future
 
 
 
-return
+
 obj
 val
 module
 scope
-variadic
-send
-new
-
+variadic -- done
+send -- done
+return -- done
+new -- done
 get_index -- done
 set_index -- done
 get -- done

jscomp/syntax/ast_external_process.ml

@@ -324,8 +324,9 @@ let parse_external_attributes
  *)
  | scopes -> { st with scopes = scopes }
  end
- | "bs.splice" | "bs.variadic" -> {st with splice = true}
- | "bs.send" ->
+ | "bs.splice" 
+ | "bs.variadic" | "variadic" -> {st with splice = true}
+ | "bs.send" | "send" ->
  { st with val_send = name_from_payload_or_prim ~loc payload}
  | "bs.send.pipe"
  ->
@@ -720,21 +721,21 @@ let external_desc_of_non_obj
  return_wrapper = _ ;
  } ->
  (* PR #2162 - since when we assemble arguments the first argument in
- [@@bs.send] is ignored
+ [@@send] is ignored
  *)
  begin match arg_type_specs with
  | [] ->
  Location.raise_errorf
- ~loc "Ill defined attribute [@@bs.send] (the external needs to be a regular function call with at least one argument)"
+ ~loc "Ill defined attribute @send(the external needs to be a regular function call with at least one argument)"
  | {arg_type = Arg_cst _ ; arg_label = _} :: _
  ->
  Location.raise_errorf
- ~loc "Ill defined attribute [@@bs.send] (first argument can't be const)"
+ ~loc "Ill defined attribute @send(first argument can't be const)"
  | _ :: _ ->
  Js_send {splice ; name; js_send_scopes = scopes ; pipe = false}
  end
  | {val_send = #bundle_source; _ }
- -> Location.raise_errorf ~loc "You used a FFI attribute that can't be used with [@@bs.send]"
+ -> Location.raise_errorf ~loc "You used a FFI attribute that can't be used with @send"
  | {val_send_pipe = Some _;
  (* splice = (false as splice); *)
  val_send = `Nm_na;
@@ -909,17 +910,17 @@ let handle_attributes
  if i = 0 && splice then
  begin match arg_label with 
  | Optional _ -> 
- Location.raise_errorf ~loc "[@@@@bs.splice] expect the last type to be a non optional"
+ Location.raise_errorf ~loc "@@variadic expect the last type to be a non optional"
  | Labelled _ | Nolabel 
  -> 
  if ty.ptyp_desc = Ptyp_any then 
- Location.raise_errorf ~loc "[@@@@bs.splice] expect the last type to be an array"; 
+ Location.raise_errorf ~loc "@@variadic expect the last type to be an array"; 
  if spec_of_ptyp true ty <> Nothing then 
- Location.raise_errorf ~loc "[@@@@bs.splice] expect the last type to be an array";
+ Location.raise_errorf ~loc "@@variadic expect the last type to be an array";
  match ty.ptyp_desc with 
  | Ptyp_constr({txt = Lident "array"; _}, [_])
  -> ()
- | _ -> Location.raise_errorf ~loc "[@@@@bs.splice] expect the last type to be an array";
+ | _ -> Location.raise_errorf ~loc "@@variadic expect the last type to be an array";
  end ; 
  let (arg_label : External_arg_spec.label_noname), arg_type, new_arg_types =
  match arg_label with

jscomp/syntax/external_ffi_types.ml

@@ -96,10 +96,10 @@ type external_spec =
  match ffi with
  | Js_get_index _scope -> "@get_index .."
  | Js_set_index _scope -> "@set_index .."
- | Js_get { js_get_name = s} -> Printf.sprintf "[@@bs.get %S]" s
- | Js_set { js_set_name = s} -> Printf.sprintf "[@@bs.set %S]" s
- | Js_call v -> Printf.sprintf "[@@bs.val %S]" v.name
- | Js_send v -> Printf.sprintf "[@@bs.send %S]" v.name
+ | Js_get { js_get_name = s} -> Printf.sprintf "[@@get %S]" s
+ | Js_set { js_set_name = s} -> Printf.sprintf "[@@set %S]" s
+ | Js_call v -> Printf.sprintf "[@@val %S]" v.name
+ | Js_send v -> Printf.sprintf "[@@send %S]" v.name
  | Js_module_as_fn v -> Printf.sprintf "[@@bs.val %S]" v.external_module_name.bundle
  | Js_new v -> Printf.sprintf "[@@new %S]" v.name
  | Js_module_as_class v

jscomp/test/demo_binding.ml

@@ -106,4 +106,4 @@ class type textArea =
 external set_interval : (unit -> unit [@bs]) -> float -> unit = "setInterval"
  [@@bs.module "@runtime", "Runtime"]
 
-external toFixed : float -> int -> string = "toFixed" [@@bs.send ]
+external toFixed : float -> int -> string = "toFixed" [@@send]