Skip to content

Commit 1355490

Browse files
glennslglennsl
committed
Added Global in js.mli too. Added updated es6 output
1 parent aa573eb commit 1355490

File tree

12 files changed

+209
-236
lines changed

12 files changed

+209
-236
lines changed

Diff for: ‎jscomp/runtime/js.mli

+1
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,4 @@ module Obj = Js_obj
103103
module Boolean = Js_boolean
104104
module Math = Js_math
105105
module Date = Js_date
106+
module Global = Js_global

Diff for: ‎lib/es6/arg.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@ function usage_b(buf, speclist, errmsg) {
118118
var buf$1 = buf;
119119
var param$1 = param;
120120
var doc = param$1[2];
121-
var spec = param$1[1];
122-
var key = param$1[0];
123121
if (doc.length) {
122+
var spec = param$1[1];
123+
var key = param$1[0];
124124
if (spec.tag === 11) {
125125
return Curry._3(Printf.bprintf(buf$1, /* Format */[
126126
/* String_literal */Block.__(11, [
@@ -536,8 +536,8 @@ function parse_argv_dynamic($staropt$star, argv, speclist, anonfun, errmsg) {
536536
case 10 :
537537
return List.iter(treat_action, param[0]);
538538
case 11 :
539-
var symb = param[0];
540539
if ((current$1[0] + 1 | 0) < l) {
540+
var symb = param[0];
541541
var arg$5 = argv[current$1[0] + 1 | 0];
542542
if (List.mem(arg$5, symb)) {
543543
Curry._1(param[1], argv[current$1[0] + 1 | 0]);

Diff for: ‎lib/es6/caml_int64.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ function sub(x, y) {
7878
}
7979

8080
function lsl_(x, numBits) {
81-
var lo = x[/* lo */1];
8281
if (numBits) {
82+
var lo = x[/* lo */1];
8383
if (numBits >= 32) {
8484
return /* record */[
8585
/* hi */(lo << (numBits - 32 | 0)),
@@ -100,8 +100,8 @@ function lsl_(x, numBits) {
100100
}
101101

102102
function lsr_(x, numBits) {
103-
var hi = x[/* hi */0];
104103
if (numBits) {
104+
var hi = x[/* hi */0];
105105
var offset = numBits - 32 | 0;
106106
if (offset) {
107107
if (offset > 0) {
@@ -133,8 +133,8 @@ function lsr_(x, numBits) {
133133
}
134134

135135
function asr_(x, numBits) {
136-
var hi = x[/* hi */0];
137136
if (numBits) {
137+
var hi = x[/* hi */0];
138138
if (numBits < 32) {
139139
var hi$1 = (hi >> numBits);
140140
var lo = (hi << (32 - numBits | 0)) | (x[/* lo */1] >>> numBits);

Diff for: ‎lib/es6/caml_parser.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ function caml_parse_engine(prim, prim$1, prim$2, prim$3) {
364364
}
365365

366366
function caml_set_parser_trace(prim) {
367-
return $$caml_set_parser_trace(prim);
367+
return +$$caml_set_parser_trace(prim);
368368
}
369369

370370
export {

Diff for: ‎lib/es6/camlinternalFormat.js

+63-101
Original file line numberDiff line numberDiff line change
@@ -1876,14 +1876,21 @@ function fmtty_of_formatting_gen(formatting_gen) {
18761876
function fmtty_of_fmt(_fmtty) {
18771877
while(true) {
18781878
var fmtty = _fmtty;
1879+
var exit = 0;
18791880
if (typeof fmtty === "number") {
1880-
return /* End_of_fmtty */0;
1881+
if (fmtty) {
1882+
return /* Char_ty */Block.__(0, [fmtty_of_fmt(fmtty[0])]);
1883+
}
1884+
else {
1885+
return /* End_of_fmtty */0;
1886+
}
18811887
}
18821888
else {
18831889
switch (fmtty.tag | 0) {
18841890
case 2 :
18851891
case 3 :
1886-
return fmtty_of_padding_fmtty(fmtty[0], /* String_ty */Block.__(1, [fmtty_of_fmt(fmtty[1])]));
1892+
exit = 1;
1893+
break;
18871894
case 4 :
18881895
var ty_rest = fmtty_of_fmt(fmtty[3]);
18891896
var prec_ty = fmtty_of_precision_fmtty(fmtty[2], /* Int_ty */Block.__(2, [ty_rest]));
@@ -1938,48 +1945,33 @@ function fmtty_of_fmt(_fmtty) {
19381945
return /* String_ty */Block.__(1, [fmtty_of_fmt(fmtty[2])]);
19391946
case 21 :
19401947
return /* Int_ty */Block.__(2, [fmtty_of_fmt(fmtty[1])]);
1941-
case 0 :
1942-
case 1 :
1943-
case 22 :
1944-
return /* Char_ty */Block.__(0, [fmtty_of_fmt(fmtty[0])]);
19451948
case 23 :
19461949
var ign = fmtty[0];
19471950
var fmt = fmtty[1];
19481951
if (typeof ign === "number") {
1949-
switch (ign) {
1950-
case 3 :
1951-
return /* Ignored_reader_ty */Block.__(14, [fmtty_of_fmt(fmt)]);
1952-
case 0 :
1953-
case 1 :
1954-
case 2 :
1955-
case 4 :
1956-
return fmtty_of_fmt(fmt);
1957-
1952+
if (ign === 3) {
1953+
return /* Ignored_reader_ty */Block.__(14, [fmtty_of_fmt(fmt)]);
19581954
}
1955+
else {
1956+
return fmtty_of_fmt(fmt);
1957+
}
1958+
}
1959+
else if (ign.tag === 8) {
1960+
return CamlinternalFormatBasics.concat_fmtty(ign[1], fmtty_of_fmt(fmt));
19591961
}
19601962
else {
1961-
switch (ign.tag | 0) {
1962-
case 8 :
1963-
return CamlinternalFormatBasics.concat_fmtty(ign[1], fmtty_of_fmt(fmt));
1964-
case 0 :
1965-
case 1 :
1966-
case 2 :
1967-
case 3 :
1968-
case 4 :
1969-
case 5 :
1970-
case 6 :
1971-
case 7 :
1972-
case 9 :
1973-
case 10 :
1974-
return fmtty_of_fmt(fmt);
1975-
1976-
}
1963+
return fmtty_of_fmt(fmt);
19771964
}
19781965
case 24 :
19791966
return fmtty_of_custom(fmtty[0], fmtty_of_fmt(fmtty[2]));
1980-
1967+
default:
1968+
return /* Char_ty */Block.__(0, [fmtty_of_fmt(fmtty[0])]);
19811969
}
19821970
}
1971+
if (exit === 1) {
1972+
return fmtty_of_padding_fmtty(fmtty[0], /* String_ty */Block.__(1, [fmtty_of_fmt(fmtty[1])]));
1973+
}
1974+
19831975
};
19841976
}
19851977

@@ -2495,31 +2487,26 @@ function type_format_gen(fmt, fmtty) {
24952487
var fmt$1 = fmt[1];
24962488
var fmtty$1 = fmtty;
24972489
if (typeof ign === "number") {
2498-
switch (ign) {
2499-
case 3 :
2500-
if (typeof fmtty$1 === "number") {
2501-
throw Type_mismatch;
2502-
}
2503-
else if (fmtty$1.tag === 14) {
2504-
var match$41 = type_format_gen(fmt$1, fmtty$1[0]);
2505-
return /* Fmt_fmtty_EBB */[
2506-
/* Ignored_param */Block.__(23, [
2507-
/* Ignored_reader */3,
2508-
match$41[0]
2509-
]),
2510-
match$41[1]
2511-
];
2512-
}
2513-
else {
2514-
throw Type_mismatch;
2515-
}
2516-
break;
2517-
case 0 :
2518-
case 1 :
2519-
case 2 :
2520-
case 4 :
2521-
return type_ignored_param_one(ign, fmt$1, fmtty$1);
2522-
2490+
if (ign === 3) {
2491+
if (typeof fmtty$1 === "number") {
2492+
throw Type_mismatch;
2493+
}
2494+
else if (fmtty$1.tag === 14) {
2495+
var match$41 = type_format_gen(fmt$1, fmtty$1[0]);
2496+
return /* Fmt_fmtty_EBB */[
2497+
/* Ignored_param */Block.__(23, [
2498+
/* Ignored_reader */3,
2499+
match$41[0]
2500+
]),
2501+
match$41[1]
2502+
];
2503+
}
2504+
else {
2505+
throw Type_mismatch;
2506+
}
2507+
}
2508+
else {
2509+
return type_ignored_param_one(ign, fmt$1, fmtty$1);
25232510
}
25242511
}
25252512
else {
@@ -2542,17 +2529,8 @@ function type_format_gen(fmt, fmtty) {
25422529
]),
25432530
match$43[1]
25442531
];
2545-
case 0 :
2546-
case 1 :
2547-
case 2 :
2548-
case 3 :
2549-
case 4 :
2550-
case 5 :
2551-
case 6 :
2552-
case 9 :
2553-
case 10 :
2554-
return type_ignored_param_one(ign, fmt$1, fmtty$1);
2555-
2532+
default:
2533+
return type_ignored_param_one(ign, fmt$1, fmtty$1);
25562534
}
25572535
}
25582536
case 22 :
@@ -2830,12 +2808,12 @@ function fix_padding(padty, width, str) {
28302808
var len = str.length;
28312809
var match_000 = Pervasives.abs(width);
28322810
var match_001 = width < 0 ? /* Left */0 : padty;
2833-
var padty$1 = match_001;
28342811
var width$1 = match_000;
28352812
if (width$1 <= len) {
28362813
return str;
28372814
}
28382815
else {
2816+
var padty$1 = match_001;
28392817
var res = Bytes.make(width$1, padty$1 === /* Zeros */2 ? /* "0" */48 : /* " " */32);
28402818
switch (padty$1) {
28412819
case 0 :
@@ -3569,41 +3547,25 @@ function make_printf(_k, o, _acc, _fmt) {
35693547
var ign = fmt[0];
35703548
var fmt$2 = fmt[1];
35713549
if (typeof ign === "number") {
3572-
switch (ign) {
3573-
case 3 :
3574-
throw [
3575-
Caml_builtin_exceptions.assert_failure,
3576-
[
3577-
"camlinternalFormat.ml",
3578-
1517,
3579-
39
3580-
]
3581-
];
3582-
case 0 :
3583-
case 1 :
3584-
case 2 :
3585-
case 4 :
3586-
return make_invalid_arg(k$2, o$2, acc$2, fmt$2);
3587-
3550+
if (ign === 3) {
3551+
throw [
3552+
Caml_builtin_exceptions.assert_failure,
3553+
[
3554+
"camlinternalFormat.ml",
3555+
1517,
3556+
39
3557+
]
3558+
];
3559+
}
3560+
else {
3561+
return make_invalid_arg(k$2, o$2, acc$2, fmt$2);
35883562
}
35893563
}
3564+
else if (ign.tag === 8) {
3565+
return make_from_fmtty(k$2, o$2, acc$2, ign[1], fmt$2);
3566+
}
35903567
else {
3591-
switch (ign.tag | 0) {
3592-
case 8 :
3593-
return make_from_fmtty(k$2, o$2, acc$2, ign[1], fmt$2);
3594-
case 0 :
3595-
case 1 :
3596-
case 2 :
3597-
case 3 :
3598-
case 4 :
3599-
case 5 :
3600-
case 6 :
3601-
case 7 :
3602-
case 9 :
3603-
case 10 :
3604-
return make_invalid_arg(k$2, o$2, acc$2, fmt$2);
3605-
3606-
}
3568+
return make_invalid_arg(k$2, o$2, acc$2, fmt$2);
36073569
}
36083570
case 24 :
36093571
return make_custom(k, o, acc, fmt[2], fmt[0], Curry._1(fmt[1], /* () */0));

0 commit comments

Comments
 (0)