Skip to content

Commit 98bc626

Browse files
author
Hongbo Zhang
committed
now uncurry support is purely non-intrusive attributes (optimizations)
1 parent f18e564 commit 98bc626

20 files changed

+118
-98
lines changed

‎jscomp/lam_compile.ml

+16-14
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ and get_exp_with_args (cxt : Lam_compile_defs.cxt) lam args_lambda
177177
end
178178
) args_lambda ([], []) in
179179

180-
181180
match closed_lambda with
182181
| Some (Lfunction (_, params, body))
183182
when Ext_list.same_length params args_lambda ->
@@ -204,13 +203,13 @@ and get_exp_with_args (cxt : Lam_compile_defs.cxt) lam args_lambda
204203
E.unit
205204
| {name = "CamlinternalMod"; _}, "init_mod" ,
206205
[
207-
_ ;
208-
shape ;
209-
(* Module []
210-
TODO: add a function [empty_shape]
211-
This pattern match is fragile, since it depends
212-
on how we compile [Lconst]
213-
*)
206+
_ ;
207+
shape ;
208+
(* Module []
209+
TODO: add a function [empty_shape]
210+
This pattern match is fragile, since it depends
211+
on how we compile [Lconst]
212+
*)
214213
] when Js_of_lam_module.is_empty_shape shape
215214
->
216215
E.dummy_obj () (* purely type definition*)
@@ -511,8 +510,11 @@ and
511510
compile_lambda cxt
512511
(Lapply (an, (args' @ args), (Lam_util.mk_apply_info App_na)))
513512
(* External function calll *)
514-
| Lapply(Lprim(Pfield (n,_), [ Lprim(Pgetglobal id,[])]), args_lambda,_info) ->
515-
513+
| Lapply(Lprim(Pfield (n,_), [ Lprim(Pgetglobal id,[])]), args_lambda,
514+
{apply_status = App_na | App_ml_full}) ->
515+
(* Note we skip [App_js_full] since [get_exp_with_args] dont carry
516+
this information, we should fix [get_exp_with_args]
517+
*)
516518
get_exp_with_args cxt lam args_lambda id n env
517519

518520

@@ -875,10 +877,10 @@ and
875877
end
876878

877879
| fn :: rest ->
878-
compile_lambda cxt @@
879-
Lambda.Lapply (fn, rest ,
880-
{apply_loc = Location.none;
881-
apply_status = App_js_full})
880+
compile_lambda cxt
881+
(Lapply (fn, rest ,
882+
{apply_loc = Location.none;
883+
apply_status = App_js_full}))
882884
| _ -> assert false
883885
else
884886
begin match args_lambda with

‎jscomp/ppx_entry.ml

+6-30
Original file line numberDiff line numberDiff line change
@@ -279,27 +279,18 @@ let gen_fn_mk loc arity args : Parsetree.expression_desc =
279279

280280

281281

282-
let handle_raw ?ty loc e attrs =
283-
let attrs =
284-
match ty with
285-
| Some ty ->
286-
Parsetree_util.attr_attribute_from_type ty :: attrs
287-
| None -> attrs in
282+
let handle_raw loc e =
288283
Ast_helper.Exp.letmodule
289284
{txt = tmp_module_name; loc }
290285
(Ast_helper.Mod.structure [
291286
Ast_helper.Str.primitive
292-
(Ast_helper.Val.mk ~attrs {loc ; txt = tmp_fn}
287+
(Ast_helper.Val.mk {loc ; txt = tmp_fn}
293288
~prim:[prim]
294-
(Ast_helper.Typ.arrow "" predef_string_type predef_any_type))]
295-
)
296-
(Ast_helper.Exp.constraint_ ~loc
289+
(Ast_helper.Typ.arrow "" predef_string_type predef_any_type))])
297290
(Ast_helper.Exp.apply
298291
(Ast_helper.Exp.ident {txt= Ldot(Lident tmp_module_name, tmp_fn) ; loc})
299292
[("",e)])
300-
(match ty with
301-
| Some ty -> ty
302-
| None -> predef_any_type)) (* FIXME: use [create_local]*)
293+
303294

304295

305296

@@ -650,25 +641,10 @@ let rec unsafe_mapper : Ast_mapper.mapper =
650641
PStr
651642
( [{ pstr_desc = Pstr_eval ({
652643
pexp_desc = Pexp_constant (Const_string (_, _)) ;
653-
pexp_attributes = attrs } as e ,
644+
} as e ,
654645
_); pstr_loc = _ }]))
655646
->
656-
657-
handle_raw loc e attrs
658-
| Pexp_extension( {txt = "bs.raw"; loc}, PStr
659-
( [{ pstr_desc = Parsetree.Pstr_eval ({
660-
pexp_desc =
661-
Pexp_constraint (
662-
{pexp_desc = Pexp_constant (Const_string (_, _)) ; _}
663-
as e,
664-
ty)
665-
; pexp_attributes = attrs} , _); }]))
666-
| Pexp_constraint({pexp_desc = Pexp_extension( {txt = "bs.raw"; loc}, PStr
667-
( [{ pstr_desc = Pstr_eval ({
668-
pexp_desc =
669-
Pexp_constant (Const_string (_, _))
670-
; pexp_attributes = attrs} as e , _); }]))}, ty)
671-
-> handle_raw ~ty loc e attrs
647+
handle_raw loc e
672648
| Pexp_extension({txt = "bs.raw"; loc}, (PTyp _ | PPat _ | PStr _))
673649
->
674650
Location.raise_errorf ~loc "bs.raw can only be applied to a string"

‎jscomp/runtime/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ $(addsuffix .cmj, $(OTHERS)): caml_builtin_exceptions.cmj block.cmj js.cmj
2121
RUNTIME := $(addsuffix .cmj, $(SOURCE_LIST))
2222

2323

24-
COMPFLAGS += $(MODULE_FLAGS) -I ../stdlib -nostdlib -nopervasives -open Pervasives -w -40 -js-npm-output-path $(npm_package_name):lib/js -js-no-builtin-ppx-mli
24+
COMPFLAGS += $(MODULE_FLAGS) -I ../stdlib -nostdlib -nopervasives -open Pervasives -w -40 -js-npm-output-path $(npm_package_name):lib/js
2525

2626

2727

‎jscomp/runtime/caml_float.ml

+8-9
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ let caml_modf_float (x : float) : float * float =
117117
else if Js.Float.is_nan x then Js.Float.nan , Js.Float.nan
118118
else (1. /. x , x)
119119

120-
let caml_ldexp_float = [%bs.raw ({| function (x,exp) {
120+
let caml_ldexp_float : float * int -> float [@uncurry] = [%bs.raw {| function (x,exp) {
121121
exp |= 0;
122122
if (exp > 1023) {
123123
exp -= 1023;
@@ -134,11 +134,11 @@ let caml_ldexp_float = [%bs.raw ({| function (x,exp) {
134134
x *= Math.pow(2, exp);
135135
return x;
136136
}
137-
|} : float -> int -> float)]
137+
|}]
138138

139139

140140

141-
let caml_frexp_float = [%bs.raw ({|function (x) {
141+
let caml_frexp_float : float -> float * int [@uncurry]= [%bs.raw {|function (x) {
142142
if ((x == 0) || !isFinite(x)) return [ x, 0];
143143
var neg = x < 0;
144144
if (neg) x = - x;
@@ -148,7 +148,7 @@ let caml_frexp_float = [%bs.raw ({|function (x) {
148148
if (neg) x = - x;
149149
return [x, exp];
150150
}
151-
|} : float -> float * int )]
151+
|}]
152152

153153
let caml_float_compare (x : float) (y : float ) =
154154
if x = y then 0
@@ -178,18 +178,17 @@ let caml_log1p_float : float -> float = function x ->
178178
if z = 0. then x else x *. log y /. z
179179

180180

181-
let caml_hypot_float = [%bs.raw ({| function (x, y) {
181+
let caml_hypot_float : float * float -> float [@uncurry] = [%bs.raw {| function (x, y) {
182182
var x0 = Math.abs(x), y0 = Math.abs(y);
183183
var a = Math.max(x0, y0), b = Math.min(x0,y0) / (a?a:1);
184184
return a * Math.sqrt(1 + b*b);
185185
}
186-
|} : float -> float -> float)
187-
]
186+
|}]
188187

189188

190-
let caml_log10_float = [%bs.raw ({| function (x) {
189+
let caml_log10_float : float -> float [@uncurry] = [%bs.raw {| function (x) {
191190
return Math.LOG10E * Math.log(x); }
192-
|} : float -> float) ]
191+
|} ]
193192

194193

195194
let caml_cosh_float x = exp x +. exp (-. x) /. 2.

‎jscomp/runtime/caml_float.mli

+6-4
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ val caml_int32_bits_of_float : float -> int32
3333

3434
val caml_classify_float : float -> fpclass
3535
val caml_modf_float : float -> float * float
36-
val caml_ldexp_float : float -> int -> float
37-
val caml_frexp_float : float -> float * int
36+
37+
val caml_ldexp_float : float * int -> float [@uncurry]
38+
val caml_frexp_float : float -> float * int [@uncurry]
3839
val caml_float_compare : float -> float -> int
3940
val caml_copysign_float : float -> float -> float
4041
val caml_expm1_float : float -> float
4142

42-
val caml_hypot_float : float -> float -> float
43-
val caml_log10_float : float -> float
43+
val caml_hypot_float : float * float -> float [@uncurry]
44+
45+
val caml_log10_float : float -> float [@uncurry]

‎jscomp/runtime/caml_format.ml

+3-4
Original file line numberDiff line numberDiff line change
@@ -361,9 +361,8 @@ let aux f (i : nativeint) =
361361
f.filter <- " ";
362362
let n = f.prec -Js.String.length !s in
363363
if n > 0 then
364-
s := repeat n "0" ^ !s
365-
end
366-
;
364+
s := repeat (n, "0")[@uncurry] ^ !s
365+
end ;
367366
finish_formatting f !s
368367

369368
let caml_format_int fmt i =
@@ -485,7 +484,7 @@ let caml_int64_format fmt x =
485484
f.filter <- " ";
486485
let n = f.prec -Js.String.length !s in
487486
if n > 0 then
488-
s := repeat n "0" ^ !s
487+
s := repeat (n, "0") [@uncurry] ^ !s
489488
end;
490489

491490
finish_formatting f !s

‎jscomp/runtime/caml_int64.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ let to_hex x =
388388
if pad <= 0 then
389389
aux x.hi ^ lo
390390
else
391-
aux x.hi ^ Caml_utils.repeat pad "0" ^ lo
391+
aux x.hi ^ Caml_utils.repeat(pad, "0") [@uncurry] ^ lo
392392

393393
let discard_sign x = {x with hi = Nativeint.logand 0x7fff_ffffn x.hi }
394394

‎jscomp/runtime/caml_io.ml

+2-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ let stdout = {
4444
output = (fun _ s ->
4545
let v =Js.String.length s - 1 in
4646
if [%bs.raw{| (typeof process !== "undefined") && process.stdout && process.stdout.write|}] then
47-
([%bs.raw{| process.stdout.write |} ] : string -> unit) s
47+
([%bs.raw{| process.stdout.write |} ] : string -> unit [@uncurry]) s [@uncurry]
4848
else
4949
if s.[v] = '\n' then
5050
Js.log (Js.String.slice s 0 v)
@@ -86,10 +86,8 @@ let caml_ml_output (oc : out_channel) (str : string) offset len =
8686
else Js.String.slice str offset len in
8787
if [%bs.raw{| (typeof process !== "undefined") && process.stdout && process.stdout.write |}] &&
8888
oc == stdout then
89-
begin
89+
([%bs.raw{| process.stdout.write |}] : string -> unit [@uncurry] ) str [@uncurry]
9090

91-
([%bs.raw{| process.stdout.write |}] : string -> unit ) str
92-
end
9391
else
9492
begin
9593

‎jscomp/runtime/caml_utils.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
(* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/imul *)
3232

3333

34-
let repeat : int -> string -> string = [%bs.raw{| (String.prototype.repeat && function (count,self){return self.repeat(count)}) ||
34+
let repeat : int * string -> string [@uncurry] = [%bs.raw{| (String.prototype.repeat && function (count,self){return self.repeat(count)}) ||
3535
function(count , self) {
3636
if (self.length == 0 || count == 0) {
3737
return '';

‎jscomp/runtime/caml_utils.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@
2929

3030

3131

32-
val repeat : int -> string -> string
32+
val repeat : int * string -> string [@uncurry]

‎jscomp/test/.depend

+8-4
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ fail_comp.cmj :
181181
fail_comp.cmx :
182182
ffi_arity_test.cmj : mt.cmi ../runtime/js.cmj
183183
ffi_arity_test.cmx : mt.cmx ../runtime/js.cmx
184-
ffi_js.cmj :
185-
ffi_js.cmx :
184+
ffi_js.cmj : ../stdlib/obj.cmi
185+
ffi_js.cmx : ../stdlib/obj.cmx
186186
ffi_test.cmj : ../runtime/js.cmj
187187
ffi_test.cmx : ../runtime/js.cmx
188188
fib.cmj :
@@ -669,6 +669,8 @@ tuple_alloc.cmj :
669669
tuple_alloc.cmx :
670670
typeof_test.cmj : mt.cmi ../runtime/js.cmj
671671
typeof_test.cmx : mt.cmx ../runtime/js.cmx
672+
uncurry_glob_test.cmj : ../runtime/caml_utils.cmi
673+
uncurry_glob_test.cmx : ../runtime/caml_utils.cmx
672674
undef_regression_test.cmj : ../runtime/js.cmj
673675
undef_regression_test.cmx : ../runtime/js.cmx
674676
unitest_string.cmj :
@@ -833,8 +835,8 @@ fail_comp.cmo :
833835
fail_comp.cmj :
834836
ffi_arity_test.cmo : mt.cmi ../runtime/js.cmo
835837
ffi_arity_test.cmj : mt.cmj ../runtime/js.cmj
836-
ffi_js.cmo :
837-
ffi_js.cmj :
838+
ffi_js.cmo : ../stdlib/obj.cmi
839+
ffi_js.cmj : ../stdlib/obj.cmj
838840
ffi_test.cmo : ../runtime/js.cmo
839841
ffi_test.cmj : ../runtime/js.cmj
840842
fib.cmo :
@@ -1321,6 +1323,8 @@ tuple_alloc.cmo :
13211323
tuple_alloc.cmj :
13221324
typeof_test.cmo : mt.cmi ../runtime/js.cmo
13231325
typeof_test.cmj : mt.cmj ../runtime/js.cmj
1326+
uncurry_glob_test.cmo : ../runtime/caml_utils.cmi
1327+
uncurry_glob_test.cmj : ../runtime/caml_utils.cmj
13241328
undef_regression_test.cmo : ../runtime/js.cmo
13251329
undef_regression_test.cmj : ../runtime/js.cmj
13261330
unitest_string.cmo :

‎jscomp/test/attr_test.ml

+4
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ class type date =
2222
end
2323

2424

25+
let max2 : float * float -> float [@uncurry] = fun [@uncurry] (x,y) ->
26+
x +. y
27+
28+
let hh = max2 (1., 2.) [@uncurry]

‎jscomp/test/ffi_js.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
let keys = [%bs.raw (" function (x){return Object.keys(x)}" : Obj.t -> string array)]
1+
let keys : Obj.t -> string array [@uncurry] = [%bs.raw " function (x){return Object.keys(x)}" ]

‎jscomp/test/string_literal_print_test.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let h = "\000\001\002\003\004\005"
1010
let x = "W"
1111
let zero_to_255 = "\000\001\002\003\004\005\006\007\008\009\010\011\012\013\014\015\016\017\018\019\020\021\022\023\024\025\026\027\028\029\030\031\032\033\034\035\036\037\038\039\040\041\042\043\044\045\046\047\048\049\050\051\052\053\054\055\056\057\058\059\060\061\062\063\064\065\066\067\068\069\070\071\072\073\074\075\076\077\078\079\080\081\082\083\084\085\086\087\088\089\090\091\092\093\094\095\096\097\098\099\100\101\102\103\104\105\106\107\108\109\110\111\112\113\114\115\116\117\118\119\120\121\122\123\124\125\126\127\128\129\130\131\132\133\134\135\136\137\138\139\140\141\142\143\144\145\146\147\148\149\150\151\152\153\154\155\156\157\158\159\160\161\162\163\164\165\166\167\168\169\170\171\172\173\174\175\176\177\178\179\180\181\182\183\184\185\186\187\188\189\190\191\192\193\194\195\196\197\198\199\200\201\202\203\204\205\206\207\208\209\210\211\212\213\214\215\216\217\218\219\220\221\222\223\224\225\226\227\228\229\230\231\232\233\234\235\236\237\238\239\240\241\242\243\244\245\246\247\248\249\250\251\252\253\254\255"
1212

13-
let js_zero_to_255 = [%bs.raw ({|"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"|} : string) ]
13+
let js_zero_to_255 : string = [%bs.raw {|"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"|} ]
1414
let wth_quote = "'\"'\""
1515

1616

‎jscomp/test/test.mllib

+3-1
Original file line numberDiff line numberDiff line change
@@ -308,4 +308,6 @@ obj_literal_ppx_test
308308
obj_literal_ppx
309309
gpr_405_test
310310

311-
attr_test
311+
attr_test
312+
313+
uncurry_glob_test

‎jscomp/test/uncurry_glob_test.ml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
2+
3+
let v = Caml_utils.repeat (100, "x") [@uncurry]
4+
5+
module M ( U : sig val f : int * string -> string [@uncurry] end ) = struct
6+
let v = U.f (100, "x") [@uncurry]
7+
end

0 commit comments

Comments
 (0)