Skip to content

Commit d648bda

Browse files
committed
Remove obj keys mangle
1 parent cc410f2 commit d648bda

15 files changed

+119
-300
lines changed

jscomp/common/lam_methname.ml

-148
This file was deleted.

jscomp/common/lam_methname.mli

-25
This file was deleted.

jscomp/core/lam_convert.ml

+3-4
Original file line numberDiff line numberDiff line change
@@ -602,10 +602,9 @@ let convert (exports : Set_ident.t) (lam : Lambda.lambda) :
602602
let setter = Ext_string.ends_with name Literals.setter_suffix in
603603
let property =
604604
if setter then
605-
Lam_methname.translate
606-
(String.sub name 0
607-
(String.length name - Literals.setter_suffix_len))
608-
else Lam_methname.translate name
605+
(String.sub name 0
606+
(String.length name - Literals.setter_suffix_len))
607+
else name
609608
in
610609
prim
611610
~primitive:(Pjs_unsafe_downgrade { name = property; setter })

jscomp/frontend/ast_external_process.ml

+9-16
Original file line numberDiff line numberDiff line change
@@ -406,29 +406,25 @@ let process_obj (loc : Location.t) (st : external_desc) (prim_name : string)
406406
param_type :: arg_types,
407407
result_types )
408408
| Arg_cst _ ->
409-
let s = Lam_methname.translate name in
410-
( {obj_arg_label = External_arg_spec.obj_label s; obj_arg_type},
409+
( {obj_arg_label = External_arg_spec.obj_label name; obj_arg_type},
411410
arg_types,
412411
(* ignored in [arg_types], reserved in [result_types] *)
413412
result_types )
414413
| Nothing ->
415-
let s = Lam_methname.translate name in
416-
( {obj_arg_label = External_arg_spec.obj_label s; obj_arg_type},
414+
( {obj_arg_label = External_arg_spec.obj_label name; obj_arg_type},
417415
param_type :: arg_types,
418416
Parsetree.Otag ({Asttypes.txt = name; loc}, [], ty)
419417
:: result_types )
420418
| Int _ ->
421-
let s = Lam_methname.translate name in
422-
( {obj_arg_label = External_arg_spec.obj_label s; obj_arg_type},
419+
( {obj_arg_label = External_arg_spec.obj_label name; obj_arg_type},
423420
param_type :: arg_types,
424421
Otag
425422
( {Asttypes.txt = name; loc},
426423
[],
427424
Ast_literal.type_int ~loc () )
428425
:: result_types )
429426
| Poly_var_string _ ->
430-
let s = Lam_methname.translate name in
431-
( {obj_arg_label = External_arg_spec.obj_label s; obj_arg_type},
427+
( {obj_arg_label = External_arg_spec.obj_label name; obj_arg_type},
432428
param_type :: arg_types,
433429
Otag
434430
( {Asttypes.txt = name; loc},
@@ -453,7 +449,6 @@ let process_obj (loc : Location.t) (st : external_desc) (prim_name : string)
453449
param_type :: arg_types,
454450
result_types )
455451
| Nothing ->
456-
let s = Lam_methname.translate name in
457452
let for_sure_not_nested =
458453
match ty.ptyp_desc with
459454
| Ptyp_constr ({txt = Lident txt; _}, []) ->
@@ -462,7 +457,7 @@ let process_obj (loc : Location.t) (st : external_desc) (prim_name : string)
462457
in
463458
( {
464459
obj_arg_label =
465-
External_arg_spec.optional for_sure_not_nested s;
460+
External_arg_spec.optional for_sure_not_nested name;
466461
obj_arg_type;
467462
},
468463
param_type :: arg_types,
@@ -472,9 +467,8 @@ let process_obj (loc : Location.t) (st : external_desc) (prim_name : string)
472467
Ast_comb.to_undefined_type loc ty )
473468
:: result_types )
474469
| Int _ ->
475-
let s = Lam_methname.translate name in
476470
( {
477-
obj_arg_label = External_arg_spec.optional true s;
471+
obj_arg_label = External_arg_spec.optional true name;
478472
obj_arg_type;
479473
},
480474
param_type :: arg_types,
@@ -485,9 +479,8 @@ let process_obj (loc : Location.t) (st : external_desc) (prim_name : string)
485479
@@ Ast_literal.type_int ~loc () )
486480
:: result_types )
487481
| Poly_var_string _ ->
488-
let s = Lam_methname.translate name in
489482
( {
490-
obj_arg_label = External_arg_spec.optional true s;
483+
obj_arg_label = External_arg_spec.optional true name;
491484
obj_arg_type;
492485
},
493486
param_type :: arg_types,
@@ -961,7 +954,7 @@ let pval_prim_of_labels (labels : string Asttypes.loc list) =
961954
([] : External_arg_spec.obj_params)
962955
(fun p arg_kinds ->
963956
let obj_arg_label =
964-
External_arg_spec.obj_label (Lam_methname.translate p.txt)
957+
External_arg_spec.obj_label (p.txt)
965958
in
966959
{obj_arg_type = Nothing; obj_arg_label} :: arg_kinds)
967960
in
@@ -974,7 +967,7 @@ let pval_prim_of_option_labels (labels : (bool * string Asttypes.loc) list)
974967
(if ends_with_unit then [External_arg_spec.empty_kind Extern_unit]
975968
else [])
976969
(fun (is_option, p) arg_kinds ->
977-
let label_name = Lam_methname.translate p.txt in
970+
let label_name = p.txt in
978971
let obj_arg_label =
979972
if is_option then External_arg_spec.optional false label_name
980973
else External_arg_spec.obj_label label_name

jscomp/test/class_type_ffi_test.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jscomp/test/gpr_1072.js

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)