Skip to content

Commit 6a43ea8

Browse files
bobzhangbobzhang
authored
Merge pull request #3917 from BuckleScript/handle_ocaml_ref_with_all_primitives
handle ref using all bs primitives
2 parents eb15a21 + c94fb7b commit 6a43ea8

File tree

221 files changed

+2880
-2856
lines changed

Some content is hidden

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

221 files changed

+2880
-2856
lines changed

‎jscomp/core/lam_compile_primitive.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ let translate loc
450450
| Poffsetint n ->
451451
E.int32_add (Ext_list.singleton_exn args) (E.small_int n)
452452
| Poffsetref n ->
453-
let v = (Js_of_lam_block.field Fld_na (Ext_list.singleton_exn args) 0l) in
453+
let v = Js_of_lam_block.field Lambda.ref_field_info (Ext_list.singleton_exn args) 0l in
454454
E.seq (E.assign v (E.int32_add v (E.small_int n))) E.unit
455455
| Psequand -> (* TODO: rhs is possibly a tail call *)
456456
begin match args with

‎jscomp/stdlib-406/pervasives.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ external snd : 'a * 'b -> 'b = "%field1"
288288

289289
type 'a ref = { mutable contents : 'a }
290290
external ref : 'a -> 'a ref = "%makemutable"
291-
external ( ! ) : 'a ref -> 'a = "%field0"
292-
external ( := ) : 'a ref -> 'a -> unit = "%setfield0"
291+
external ( ! ) : 'a ref -> 'a = "%bs_ref_field0"
292+
external ( := ) : 'a ref -> 'a -> unit = "%bs_ref_setfield0"
293293
external incr : int ref -> unit = "%incr"
294294
external decr : int ref -> unit = "%decr"
295295

‎jscomp/stdlib-406/pervasives.mli

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,12 +1179,12 @@ type 'a ref = { mutable contents : 'a }
11791179
external ref : 'a -> 'a ref = "%makemutable"
11801180
(** Return a fresh reference containing the given value. *)
11811181

1182-
external ( ! ) : 'a ref -> 'a = "%field0"
1182+
external ( ! ) : 'a ref -> 'a = "%bs_ref_field0"
11831183
(** [!r] returns the current contents of reference [r].
11841184
Equivalent to [fun r -> r.contents].
11851185
Unary operator at precedence level 11/11.*)
11861186

1187-
external ( := ) : 'a ref -> 'a -> unit = "%setfield0"
1187+
external ( := ) : 'a ref -> 'a -> unit = "%bs_ref_setfield0"
11881188
(** [r := a] stores the value of [a] in reference [r].
11891189
Equivalent to [fun r v -> r.contents <- v].
11901190
Right-associative operator at precedence level 1/11. *)

‎jscomp/test/406_primitive_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function f(param) {
4646
}
4747
}
4848

49-
Mt.from_pair_suites("406_primitive_test", suites[0]);
49+
Mt.from_pair_suites("406_primitive_test", suites[/* contents */0]);
5050

5151
exports.suites = suites;
5252
exports.test_id = test_id;

‎jscomp/test/a_filename_test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ var suites = /* record */[/* contents : [] */0];
1010
var test_id = /* record */[/* contents */0];
1111

1212
function eq(loc, x, y) {
13-
test_id[0] = test_id[0] + 1 | 0;
14-
suites[0] = /* :: */[
13+
test_id[/* contents */0] = test_id[/* contents */0] + 1 | 0;
14+
suites[/* contents */0] = /* :: */[
1515
/* tuple */[
16-
loc + (" id " + String(test_id[0])),
16+
loc + (" id " + String(test_id[/* contents */0])),
1717
(function (param) {
1818
return /* Eq */Block.__(0, [
1919
x,
2020
y
2121
]);
2222
})
2323
],
24-
suites[0]
24+
suites[/* contents */0]
2525
];
2626
return /* () */0;
2727
}
@@ -126,7 +126,7 @@ eq("File \"a_filename_test.ml\", line 73, characters 5-12", $$Array.map(Ext_file
126126
"/a.txt"
127127
]);
128128

129-
Mt.from_pair_suites("A_filename_test", suites[0]);
129+
Mt.from_pair_suites("A_filename_test", suites[/* contents */0]);
130130

131131
exports.suites = suites;
132132
exports.test_id = test_id;

‎jscomp/test/ari_regress_test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var h = /* record */[/* contents */0];
1010

1111
function g1(x, y) {
1212
var u = x + y | 0;
13-
h[0] = h[0] + 1 | 0;
13+
h[/* contents */0] = h[/* contents */0] + 1 | 0;
1414
return (function (xx, yy) {
1515
return (xx + yy | 0) + u | 0;
1616
});
@@ -63,7 +63,7 @@ var suites_001 = /* :: */[
6363
"File \"ari_regress_test.ml\", line 20, characters 4-11",
6464
(function (param) {
6565
return /* Eq */Block.__(0, [
66-
h[0],
66+
h[/* contents */0],
6767
1
6868
]);
6969
})

‎jscomp/test/arity_deopt.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ var suites = /* record */[/* contents : [] */0];
99
var test_id = /* record */[/* contents */0];
1010

1111
function eq(loc, x, y) {
12-
test_id[0] = test_id[0] + 1 | 0;
13-
suites[0] = /* :: */[
12+
test_id[/* contents */0] = test_id[/* contents */0] + 1 | 0;
13+
suites[/* contents */0] = /* :: */[
1414
/* tuple */[
15-
loc + (" id " + String(test_id[0])),
15+
loc + (" id " + String(test_id[/* contents */0])),
1616
(function (param) {
1717
return /* Eq */Block.__(0, [
1818
x,
1919
y
2020
]);
2121
})
2222
],
23-
suites[0]
23+
suites[/* contents */0]
2424
];
2525
return /* () */0;
2626
}
@@ -59,7 +59,7 @@ eq("File \"arity_deopt.ml\", line 48, characters 15-22", 6, (function (y, z) {
5959
return (1 + y | 0) + z | 0;
6060
})(2, 3));
6161

62-
Mt.from_pair_suites("Arity_deopt", suites[0]);
62+
Mt.from_pair_suites("Arity_deopt", suites[/* contents */0]);
6363

6464
exports.suites = suites;
6565
exports.test_id = test_id;

‎jscomp/test/array_subtle_test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ var test_id = /* record */[/* contents */0];
1111
function eq(loc, param) {
1212
var y = param[1];
1313
var x = param[0];
14-
test_id[0] = test_id[0] + 1 | 0;
15-
suites[0] = /* :: */[
14+
test_id[/* contents */0] = test_id[/* contents */0] + 1 | 0;
15+
suites[/* contents */0] = /* :: */[
1616
/* tuple */[
17-
loc + (" id " + String(test_id[0])),
17+
loc + (" id " + String(test_id[/* contents */0])),
1818
(function (param) {
1919
return /* Eq */Block.__(0, [
2020
x,
2121
y
2222
]);
2323
})
2424
],
25-
suites[0]
25+
suites[/* contents */0]
2626
];
2727
return /* () */0;
2828
}
@@ -126,7 +126,7 @@ eq("File \"array_subtle_test.ml\", line 53, characters 6-13", /* tuple */[
126126
1
127127
]);
128128

129-
Mt.from_pair_suites("Array_subtle_test", suites[0]);
129+
Mt.from_pair_suites("Array_subtle_test", suites[/* contents */0]);
130130

131131
exports.suites = suites;
132132
exports.test_id = test_id;

‎jscomp/test/ast_abstract_test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ var suites = /* record */[/* contents : [] */0];
99
var test_id = /* record */[/* contents */0];
1010

1111
function eq(loc, x, y) {
12-
test_id[0] = test_id[0] + 1 | 0;
13-
suites[0] = /* :: */[
12+
test_id[/* contents */0] = test_id[/* contents */0] + 1 | 0;
13+
suites[/* contents */0] = /* :: */[
1414
/* tuple */[
15-
loc + (" id " + String(test_id[0])),
15+
loc + (" id " + String(test_id[/* contents */0])),
1616
(function (param) {
1717
return /* Eq */Block.__(0, [
1818
x,
1919
y
2020
]);
2121
})
2222
],
23-
suites[0]
23+
suites[/* contents */0]
2424
];
2525
return /* () */0;
2626
}
@@ -192,7 +192,7 @@ function zFromJs(param) {
192192

193193
}
194194

195-
Mt.from_pair_suites("Ast_abstract_test", suites[0]);
195+
Mt.from_pair_suites("Ast_abstract_test", suites[/* contents */0]);
196196

197197
var jsMapperEraseType = /* JsMapperEraseType */0;
198198

‎jscomp/test/ast_js_mapper_poly_test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ var suites = /* record */[/* contents : [] */0];
1010
var test_id = /* record */[/* contents */0];
1111

1212
function eq(loc, x, y) {
13-
test_id[0] = test_id[0] + 1 | 0;
14-
suites[0] = /* :: */[
13+
test_id[/* contents */0] = test_id[/* contents */0] + 1 | 0;
14+
suites[/* contents */0] = /* :: */[
1515
/* tuple */[
16-
loc + (" id " + String(test_id[0])),
16+
loc + (" id " + String(test_id[/* contents */0])),
1717
(function (param) {
1818
return /* Eq */Block.__(0, [
1919
x,
2020
y
2121
]);
2222
})
2323
],
24-
suites[0]
24+
suites[/* contents */0]
2525
];
2626
return /* () */0;
2727
}
@@ -256,7 +256,7 @@ eq("File \"ast_js_mapper_poly_test.ml\", line 89, characters 5-12", $$Array.map(
256256
/* C5 */5
257257
])), /* array */[undefined]));
258258

259-
Mt.from_pair_suites("Ast_js_mapper_poly_test", suites[0]);
259+
Mt.from_pair_suites("Ast_js_mapper_poly_test", suites[/* contents */0]);
260260

261261
var $plus$great = $$Array.append;
262262

‎jscomp/test/ast_mapper_defensive_test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ var suites = /* record */[/* contents : [] */0];
99
var test_id = /* record */[/* contents */0];
1010

1111
function $$throw(loc, x) {
12-
test_id[0] = test_id[0] + 1 | 0;
13-
suites[0] = /* :: */[
12+
test_id[/* contents */0] = test_id[/* contents */0] + 1 | 0;
13+
suites[/* contents */0] = /* :: */[
1414
/* tuple */[
15-
loc + (" id " + String(test_id[0])),
15+
loc + (" id " + String(test_id[/* contents */0])),
1616
(function (param) {
1717
return /* ThrowAny */Block.__(7, [x]);
1818
})
1919
],
20-
suites[0]
20+
suites[/* contents */0]
2121
];
2222
return /* () */0;
2323
}
@@ -85,7 +85,7 @@ $$throw("File \"ast_mapper_defensive_test.ml\", line 30, characters 15-22", (fun
8585
return /* () */0;
8686
}));
8787

88-
Mt.from_pair_suites("Ast_mapper_defensive_test", suites[0]);
88+
Mt.from_pair_suites("Ast_mapper_defensive_test", suites[/* contents */0]);
8989

9090
exports.suites = suites;
9191
exports.test_id = test_id;

‎jscomp/test/basic_module_test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ var Mt_global = require("./mt_global.js");
88
var count = /* record */[/* contents */0];
99

1010
function test(set) {
11-
count[0] = Offset.$$Set.cardinal(set) + count[0] | 0;
11+
count[/* contents */0] = Offset.$$Set.cardinal(set) + count[/* contents */0] | 0;
1212
return /* () */0;
1313
}
1414

@@ -22,8 +22,8 @@ function eq(f, a, b) {
2222
return Mt_global.collect_eq(test_id, suites, f, a, b);
2323
}
2424

25-
eq("File \"basic_module_test.ml\", line 39, characters 12-19", count[0], 1);
25+
eq("File \"basic_module_test.ml\", line 39, characters 12-19", count[/* contents */0], 1);
2626

27-
Mt.from_pair_suites("Basic_module_test", suites[0]);
27+
Mt.from_pair_suites("Basic_module_test", suites[/* contents */0]);
2828

2929
/* Not a pure module */

‎jscomp/test/bdd.js

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var nodeC = /* record */[/* contents */1];
3535

3636
var sz_1 = /* record */[/* contents */8191];
3737

38-
var htab = /* record */[/* contents */Caml_array.caml_make_vect(sz_1[0] + 1 | 0, /* [] */0)];
38+
var htab = /* record */[/* contents */Caml_array.caml_make_vect(sz_1[/* contents */0] + 1 | 0, /* [] */0)];
3939

4040
var n_items = /* record */[/* contents */0];
4141

@@ -44,7 +44,7 @@ function hashVal(x, y, v) {
4444
}
4545

4646
function resize(newSize) {
47-
var arr = htab[0];
47+
var arr = htab[/* contents */0];
4848
var newSz_1 = newSize - 1 | 0;
4949
var newArr = Caml_array.caml_make_vect(newSize, /* [] */0);
5050
var copyBucket = function (_bucket) {
@@ -74,37 +74,37 @@ function resize(newSize) {
7474
}
7575
};
7676
};
77-
for(var n = 0 ,n_finish = sz_1[0]; n <= n_finish; ++n){
77+
for(var n = 0 ,n_finish = sz_1[/* contents */0]; n <= n_finish; ++n){
7878
copyBucket(Caml_array.caml_array_get(arr, n));
7979
}
80-
htab[0] = newArr;
81-
sz_1[0] = newSz_1;
80+
htab[/* contents */0] = newArr;
81+
sz_1[/* contents */0] = newSz_1;
8282
return /* () */0;
8383
}
8484

8585
function insert(idl, idh, v, ind, bucket, newNode) {
86-
if (n_items[0] <= sz_1[0]) {
87-
Caml_array.caml_array_set(htab[0], ind, /* :: */[
86+
if (n_items[/* contents */0] <= sz_1[/* contents */0]) {
87+
Caml_array.caml_array_set(htab[/* contents */0], ind, /* :: */[
8888
newNode,
8989
bucket
9090
]);
91-
n_items[0] = n_items[0] + 1 | 0;
91+
n_items[/* contents */0] = n_items[/* contents */0] + 1 | 0;
9292
return /* () */0;
9393
} else {
94-
resize((sz_1[0] + sz_1[0] | 0) + 2 | 0);
95-
var ind$1 = hashVal(idl, idh, v) & sz_1[0];
96-
return Caml_array.caml_array_set(htab[0], ind$1, /* :: */[
94+
resize((sz_1[/* contents */0] + sz_1[/* contents */0] | 0) + 2 | 0);
95+
var ind$1 = hashVal(idl, idh, v) & sz_1[/* contents */0];
96+
return Caml_array.caml_array_set(htab[/* contents */0], ind$1, /* :: */[
9797
newNode,
98-
Caml_array.caml_array_get(htab[0], ind$1)
98+
Caml_array.caml_array_get(htab[/* contents */0], ind$1)
9999
]);
100100
}
101101
}
102102

103103
function resetUnique(param) {
104-
sz_1[0] = 8191;
105-
htab[0] = Caml_array.caml_make_vect(sz_1[0] + 1 | 0, /* [] */0);
106-
n_items[0] = 0;
107-
nodeC[0] = 1;
104+
sz_1[/* contents */0] = 8191;
105+
htab[/* contents */0] = Caml_array.caml_make_vect(sz_1[/* contents */0] + 1 | 0, /* [] */0);
106+
n_items[/* contents */0] = 0;
107+
nodeC[/* contents */0] = 1;
108108
return /* () */0;
109109
}
110110

@@ -114,8 +114,8 @@ function mkNode(low, v, high) {
114114
if (idl === idh) {
115115
return low;
116116
} else {
117-
var ind = hashVal(idl, idh, v) & sz_1[0];
118-
var bucket = Caml_array.caml_array_get(htab[0], ind);
117+
var ind = hashVal(idl, idh, v) & sz_1[/* contents */0];
118+
var bucket = Caml_array.caml_array_get(htab[/* contents */0], ind);
119119
var _b = bucket;
120120
while(true) {
121121
var b = _b;
@@ -138,7 +138,7 @@ function mkNode(low, v, high) {
138138
continue ;
139139
}
140140
} else {
141-
var n_002 = (nodeC[0] = nodeC[0] + 1 | 0, nodeC[0]);
141+
var n_002 = (nodeC[/* contents */0] = nodeC[/* contents */0] + 1 | 0, nodeC[/* contents */0]);
142142
var n$1 = /* Node */[
143143
low,
144144
v,
@@ -328,8 +328,8 @@ function hwb(n) {
328328
var seed = /* record */[/* contents */0];
329329

330330
function random(param) {
331-
seed[0] = Caml_int32.imul(seed[0], 25173) + 17431 | 0;
332-
return (seed[0] & 1) > 0;
331+
seed[/* contents */0] = Caml_int32.imul(seed[/* contents */0], 25173) + 17431 | 0;
332+
return (seed[/* contents */0] & 1) > 0;
333333
}
334334

335335
function random_vars(n) {

‎jscomp/test/block_alias_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ b("File \"block_alias_test.ml\", line 33, characters 5-12", Caml_obj.caml_equal(
6161

6262
eq("File \"block_alias_test.ml\", line 34, characters 6-13", v0, v1);
6363

64-
Mt.from_pair_suites("Block_alias_test", suites[0]);
64+
Mt.from_pair_suites("Block_alias_test", suites[/* contents */0]);
6565

6666
var h = List.length;
6767

0 commit comments

Comments
 (0)