Skip to content

Commit 7289eff

Browse files
committed
remove unneeded ppx for method call
1 parent 4d7531b commit 7289eff

File tree

12 files changed

+62
-99
lines changed

12 files changed

+62
-99
lines changed

jscomp/core/lam_convert.ml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -816,22 +816,20 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) : Lam.t * Lam_module_i
816816
Lam.for_ id (convert_aux from_) (convert_aux to_) dir (convert_aux loop)
817817
| Lassign (id, body) ->
818818
Lam.assign id (convert_aux body)
819-
| Lsend (Public(Some name), _, obj, _, _loc) ->
819+
| Lsend (Public(Some name), _, obj, _, loc) ->
820820
(* Format.fprintf Format.err_formatter "%a@." Printlambda.lambda b ; *)
821-
(match convert_aux obj with
822-
| Lprim {primitive = Pjs_unsafe_downgrade _; args;loc}
823-
->
824-
let setter = Ext_string.ends_with name Literals.setter_suffix in
825-
let property =
826-
if setter then
827-
Lam_methname.translate
828-
(String.sub name 0
829-
(String.length name - Literals.setter_suffix_len))
830-
else Lam_methname.translate name in
831-
prim ~primitive:(Pjs_unsafe_downgrade {name = property; setter})
832-
~args loc
833-
| _ ->
834-
assert false)
821+
let obj = convert_aux obj in
822+
let args = [obj] in
823+
let setter = Ext_string.ends_with name Literals.setter_suffix in
824+
let property =
825+
if setter then
826+
Lam_methname.translate
827+
(String.sub name 0
828+
(String.length name - Literals.setter_suffix_len))
829+
else Lam_methname.translate name in
830+
prim ~primitive:(Pjs_unsafe_downgrade {name = property; setter})
831+
~args loc
832+
835833
| Lsend _ -> assert false
836834
| Levent _ ->
837835
(* disabled by upstream*)

jscomp/ext/literals.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ let setter_suffix = "#="
5353
let setter_suffix_len = String.length setter_suffix
5454

5555
let debugger = "debugger"
56-
let unsafe_downgrade = "unsafe_downgrade"
56+
5757
let fn_run = "fn_run"
5858
let method_run = "method_run"
5959

jscomp/frontend/ast_util.ml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ type label_exprs = (Longident.t Asttypes.loc * Parsetree.expression) list
2929

3030
let js_property loc obj (name : string) =
3131
Parsetree.Pexp_send
32-
((Ast_compatible.app1 ~loc
33-
(Exp.ident ~loc
34-
{loc;
35-
txt = Ldot (Ast_literal.Lid.js_oo, Literals.unsafe_downgrade)})
36-
obj),
32+
(obj,
3733
{loc; txt = name}
3834
)
3935

jscomp/frontend/bs_ast_invariant.ml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,6 @@ let emit_external_warnings : iterator=
142142
| Pexp_new _ ->
143143
Location.raise_errorf ~loc:a.pexp_loc
144144
"OCaml style objects are not supported"
145-
| Pexp_send (obj, _) ->
146-
begin match obj with
147-
| {pexp_desc = Pexp_apply ({pexp_desc = Pexp_ident ({txt = Ldot(_,"unsafe_downgrade")})},_)} -> ()
148-
| _ -> Location.raise_errorf ~loc:a.pexp_loc
149-
"OCaml style objects are not supported"
150-
end
151145
| _ -> super.expr self a
152146
);
153147
label_declaration = (fun self lbl ->

jscomp/main/builtin_cmi_datasets.ml

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

jscomp/others/js_OO.ml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424

2525
[@@@bs.config {flags = [|"-unboxed-types"|]}]
2626
(**/**)
27-
external unsafe_downgrade : 'a -> 'a = "#unsafe_downgrade"
28-
external unsafe_to_method : 'a -> 'a = "#fn_method"
27+
external unsafe_to_method : 'a -> 'a = "#fn_method"
2928
(**/**)
3029
module Callback = struct
3130
type 'a arity1 = {

lib/4.06.1/bsb.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5281,7 +5281,7 @@ let setter_suffix = "#="
52815281
let setter_suffix_len = String.length setter_suffix
52825282

52835283
let debugger = "debugger"
5284-
let unsafe_downgrade = "unsafe_downgrade"
5284+
52855285
let fn_run = "fn_run"
52865286
let method_run = "method_run"
52875287

lib/4.06.1/bsb_helper.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1250,7 +1250,7 @@ let setter_suffix = "#="
12501250
let setter_suffix_len = String.length setter_suffix
12511251

12521252
let debugger = "debugger"
1253-
let unsafe_downgrade = "unsafe_downgrade"
1253+
12541254
let fn_run = "fn_run"
12551255
let method_run = "method_run"
12561256

lib/4.06.1/unstable/all_ounit_tests.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6056,7 +6056,7 @@ let setter_suffix = "#="
60566056
let setter_suffix_len = String.length setter_suffix
60576057

60586058
let debugger = "debugger"
6059-
let unsafe_downgrade = "unsafe_downgrade"
6059+
60606060
let fn_run = "fn_run"
60616061
let method_run = "method_run"
60626062

lib/4.06.1/unstable/bspack.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10840,7 +10840,7 @@ let setter_suffix = "#="
1084010840
let setter_suffix_len = String.length setter_suffix
1084110841

1084210842
let debugger = "debugger"
10843-
let unsafe_downgrade = "unsafe_downgrade"
10843+
1084410844
let fn_run = "fn_run"
1084510845
let method_run = "method_run"
1084610846

0 commit comments

Comments
 (0)