Skip to content

Commit 8582024

Browse files
committed
rebase on master
1 parent d6c7d6e commit 8582024

21 files changed

+71360
-40285
lines changed

jscomp/test/caml_format_test.js

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

jscomp/test/flow_parser_reg_test.js

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

jscomp/test/js_json_test.js

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

jscomp/test/mario_game.js

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

jscomp/test/miss_colon_test.js

Lines changed: 44 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
var Block = require("../../lib/js/block.js");
43
var Caml_int32 = require("../../lib/js/caml_int32.js");
54

65
function $plus$colon(_f, _g) {
@@ -15,16 +14,22 @@ function $plus$colon(_f, _g) {
1514
}
1615

1716
} else {
18-
return /* Int */Block.__(0, [n + g[0] | 0]);
17+
return /* constructor */{
18+
tag: 0,
19+
name: "Int",
20+
"0": n + g[0] | 0
21+
};
1922
}
2023
}
2124
switch (g.tag | 0) {
2225
case /* Int */0 :
2326
if (g[0] !== 0) {
24-
return /* Add */Block.__(2, [
25-
f,
26-
g
27-
]);
27+
return /* constructor */{
28+
tag: 2,
29+
name: "Add",
30+
"0": f,
31+
"1": g
32+
};
2833
} else {
2934
return f;
3035
}
@@ -34,10 +39,12 @@ function $plus$colon(_f, _g) {
3439
continue ;
3540
case /* Var */1 :
3641
case /* Mul */3 :
37-
return /* Add */Block.__(2, [
38-
f,
39-
g
40-
]);
42+
return /* constructor */{
43+
tag: 2,
44+
name: "Add",
45+
"0": f,
46+
"1": g
47+
};
4148

4249
}
4350
};
@@ -57,17 +64,29 @@ function $star$colon(_f, _g) {
5764
if (n !== 0) {
5865
exit$1 = 3;
5966
} else {
60-
return /* Int */Block.__(0, [0]);
67+
return /* constructor */{
68+
tag: 0,
69+
name: "Int",
70+
"0": 0
71+
};
6172
}
6273
} else {
63-
return /* Int */Block.__(0, [Caml_int32.imul(n, g[0])]);
74+
return /* constructor */{
75+
tag: 0,
76+
name: "Int",
77+
"0": Caml_int32.imul(n, g[0])
78+
};
6479
}
6580
}
6681
if (exit$1 === 3) {
6782
if (g.tag || g[0] !== 0) {
6883
exit = 2;
6984
} else {
70-
return /* Int */Block.__(0, [0]);
85+
return /* constructor */{
86+
tag: 0,
87+
name: "Int",
88+
"0": 0
89+
};
7190
}
7291
}
7392
if (exit === 2 && !f.tag && f[0] === 1) {
@@ -76,19 +95,23 @@ function $star$colon(_f, _g) {
7695
switch (g.tag | 0) {
7796
case /* Int */0 :
7897
if (g[0] !== 1) {
79-
return /* Mul */Block.__(3, [
80-
f,
81-
g
82-
]);
98+
return /* constructor */{
99+
tag: 3,
100+
name: "Mul",
101+
"0": f,
102+
"1": g
103+
};
83104
} else {
84105
return f;
85106
}
86107
case /* Var */1 :
87108
case /* Add */2 :
88-
return /* Mul */Block.__(3, [
89-
f,
90-
g
91-
]);
109+
return /* constructor */{
110+
tag: 3,
111+
name: "Mul",
112+
"0": f,
113+
"1": g
114+
};
92115
case /* Mul */3 :
93116
_g = g[1];
94117
_f = $star$colon(f, g[0]);

0 commit comments

Comments
 (0)