Skip to content

Commit e01ffd8

Browse files
author
Hongbo Zhang
committed
Merge branch 'update_with_npm'
2 parents 24cff53 + cc99027 commit e01ffd8

File tree

354 files changed

+753
-525
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

354 files changed

+753
-525
lines changed

‎jscomp/bin/compiler.ml‎

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

‎jscomp/bin/ocaml_pack.ml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(** Bundled by ocaml_pack 04/16-11:04 *)
1+
(** Bundled by ocaml_pack 05/23-09:55 *)
22
module Ext_bytes : sig
33
#1 "ext_bytes.mli"
44
(* Copyright (C) 2015-2016 Bloomberg Finance L.P.
@@ -1413,7 +1413,7 @@ let _ =
14131413
let local_time = Unix.(localtime (gettimeofday ())) in
14141414
output_string stdout
14151415
(Printf.sprintf {|(** Bundled by ocaml_pack %02d/%02d-%02d:%02d *)|}
1416-
local_time.tm_mon local_time.tm_mday
1416+
(local_time.tm_mon + 1) local_time.tm_mday
14171417
local_time.tm_hour local_time.tm_min
14181418
);
14191419
output_string stdout "\n";

‎jscomp/js_cmj_datasets.ml‎

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

‎jscomp/js_config.ml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ let gc = "Caml_gc"
202202
let int32 = "Caml_int32"
203203
let block = "Block"
204204
let js_primitive = "Js_primitive"
205-
let version = "0.4.2"
205+
let version = "0.5.0"
206206
let runtime_set =
207207
[
208208
js_primitive;

‎jscomp/ppx_entry.ml‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,25 @@ let prim_stmt = "js_pure_stmt"
6868
let prim_debugger = "js_debugger"
6969

7070
(* TODO should be renamed in to {!Js.fn} *)
71-
let curry_type_id = Longident.Ldot (Lident "Pervasives", "uncurry")
71+
(* TODO should be moved into {!Js.t} Later *)
72+
let pervasives_js_obj = Longident.Ldot (Lident "Pervasives", "js_obj")
73+
let pervasives_uncurry = Longident.Ldot (Lident "Pervasives", "uncurry")
74+
let js_obj = Longident.Ldot (Lident "Js", "t")
75+
let js_fn = Longident.Ldot (Lident "Js", "fn")
76+
let js_obj_type_id () =
77+
if Js_config.get_env () = Browser then
78+
pervasives_js_obj
79+
else js_obj
80+
81+
let curry_type_id () =
82+
if Js_config.get_env () = Browser then
83+
pervasives_uncurry
84+
else
85+
js_fn
86+
7287
let ignore_id = Longident.Ldot (Lident "Pervasives", "ignore")
73-
let js_unsafe_downgrade_id = Longident.Ldot (Ldot (Lident "Js", "Unsafe"), "!")
7488

75-
(* TODO should be moved into {!Js.t} Later *)
76-
let js_obj_type_id = Longident.Ldot (Lident "Pervasives", "js_obj")
89+
7790

7891
(* note we first declare its type is [unit],
7992
then [ignore] it, [ignore] is necessary since
@@ -167,7 +180,7 @@ let handle_record_as_js_object
167180

168181
let result_type =
169182
{Parsetree.ptyp_desc =
170-
Ptyp_constr ({txt = js_obj_type_id ; loc},
183+
Ptyp_constr ({txt = js_obj_type_id () ; loc},
171184
[{ Parsetree.ptyp_desc =
172185
Ptyp_object (List.map2 (fun x y -> x ,[], y) labels tyvars, Closed);
173186
ptyp_attributes = [];
@@ -206,7 +219,7 @@ let gen_fn_run loc arity args : Parsetree.expression_desc =
206219
in
207220
let uncurry_fn =
208221
{ptyp_desc =
209-
Ptyp_constr ({txt = curry_type_id; loc},
222+
Ptyp_constr ({txt = curry_type_id (); loc},
210223
[{ptyp_desc = tuple_type_desc ;
211224
ptyp_attributes;
212225
ptyp_loc = loc }]);
@@ -243,7 +256,7 @@ let gen_fn_mk loc arity args : Parsetree.expression_desc =
243256
in
244257
let uncurry_fn =
245258
{ptyp_desc =
246-
Ptyp_constr ({txt = curry_type_id; loc},
259+
Ptyp_constr ({txt = curry_type_id (); loc},
247260
[{ptyp_desc = tuple_type_desc ;
248261
ptyp_attributes;
249262
ptyp_loc = loc }]);
@@ -322,7 +335,7 @@ let uncurry_fn_type loc ty ptyp_attributes
322335
ptyp_attributes }
323336
in
324337
{ ty with ptyp_desc =
325-
Ptyp_constr ({txt = curry_type_id ; loc},
338+
Ptyp_constr ({txt = curry_type_id () ; loc},
326339
[ fn_type]);
327340
ptyp_attributes = []
328341
}
@@ -383,7 +396,7 @@ let handle_typ
383396
{ty with ptyp_desc = Ptyp_object (methods, closed_flag)}
384397
| Some _, ptyp_attributes ->
385398
{ptyp_desc =
386-
Ptyp_constr ({ txt = js_obj_type_id ; loc},
399+
Ptyp_constr ({ txt = js_obj_type_id () ; loc},
387400
[{ ty with ptyp_desc = Ptyp_object(methods, closed_flag);
388401
ptyp_attributes }]);
389402
ptyp_attributes = [];
@@ -482,7 +495,7 @@ let handle_obj_property loc obj name e
482495
~pval_type:({ptyp_desc =
483496
Ptyp_arrow ("",
484497
{ptyp_desc =
485-
Ptyp_constr ({txt = js_obj_type_id ; loc},
498+
Ptyp_constr ({txt = js_obj_type_id () ; loc},
486499
[{ptyp_desc = Ptyp_var "a" ;
487500
ptyp_loc = loc;
488501
ptyp_attributes = [] }]);
@@ -545,7 +558,7 @@ let handle_obj_method loc (obj : Parsetree.expression)
545558
~pval_type:({ptyp_desc =
546559
Ptyp_arrow ("",
547560
{ptyp_desc =
548-
Ptyp_constr ({txt = js_obj_type_id ; loc},
561+
Ptyp_constr ({txt = js_obj_type_id () ; loc},
549562
[{ptyp_desc = Ptyp_var "a" ;
550563
ptyp_loc = loc;
551564
ptyp_attributes = [] }]);

‎jscomp/tools/ocaml_pack_main.ml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ let _ =
4545
let local_time = Unix.(localtime (gettimeofday ())) in
4646
output_string stdout
4747
(Printf.sprintf {|(** Bundled by ocaml_pack %02d/%02d-%02d:%02d *)|}
48-
local_time.tm_mon local_time.tm_mday
48+
(local_time.tm_mon + 1) local_time.tm_mday
4949
local_time.tm_hour local_time.tm_min
5050
);
5151
output_string stdout "\n";

‎lib/js/arg.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// GENERATED CODE BY BUCKLESCRIPT VERSION 0.4.2 , PLEASE EDIT WITH CARE
1+
// GENERATED CODE BY BUCKLESCRIPT VERSION 0.5.0 , PLEASE EDIT WITH CARE
22
'use strict';
33

44
var Caml_obj = require("./caml_obj");

‎lib/js/array.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// GENERATED CODE BY BUCKLESCRIPT VERSION 0.4.2 , PLEASE EDIT WITH CARE
1+
// GENERATED CODE BY BUCKLESCRIPT VERSION 0.5.0 , PLEASE EDIT WITH CARE
22
'use strict';
33

44
var Caml_builtin_exceptions = require("./caml_builtin_exceptions");

‎lib/js/arrayLabels.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// GENERATED CODE BY BUCKLESCRIPT VERSION 0.4.2 , PLEASE EDIT WITH CARE
1+
// GENERATED CODE BY BUCKLESCRIPT VERSION 0.5.0 , PLEASE EDIT WITH CARE
22
'use strict';
33

44
var $$Array = require("./array");

‎lib/js/bigarray.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// GENERATED CODE BY BUCKLESCRIPT VERSION 0.4.2 , PLEASE EDIT WITH CARE
1+
// GENERATED CODE BY BUCKLESCRIPT VERSION 0.5.0 , PLEASE EDIT WITH CARE
22
'use strict';
33

44
var Caml_builtin_exceptions = require("./caml_builtin_exceptions");

0 commit comments

Comments
 (0)