Skip to content

Commit 865bfde

Browse files
bobzhangbobzhang
committed
check in relevant changes in js file
1 parent 82c8166 commit 865bfde

10 files changed

+30
-97
lines changed

‎lib/js/buffer.js

+4-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
var Sys = require("./sys.js");
43
var Bytes = require("./bytes.js");
54
var Curry = require("./curry.js");
65
var $$String = require("./string.js");
@@ -10,12 +9,11 @@ var Caml_builtin_exceptions = require("./caml_builtin_exceptions.js");
109

1110
function create(n) {
1211
var n$1 = n < 1 ? 1 : n;
13-
var n$2 = n$1 > Sys.max_string_length ? Sys.max_string_length : n$1;
14-
var s = Caml_string.caml_create_string(n$2);
12+
var s = Caml_string.caml_create_string(n$1);
1513
return /* record */[
1614
/* buffer */s,
1715
/* position */0,
18-
/* length */n$2,
16+
/* length */n$1,
1917
/* initial_buffer */s
2018
];
2119
}
@@ -83,16 +81,6 @@ function resize(b, more) {
8381
while((b[/* position */1] + more | 0) > new_len) {
8482
new_len = (new_len << 1);
8583
};
86-
if (new_len > Sys.max_string_length) {
87-
if ((b[/* position */1] + more | 0) <= Sys.max_string_length) {
88-
new_len = Sys.max_string_length;
89-
} else {
90-
throw [
91-
Caml_builtin_exceptions.failure,
92-
"Buffer.add: cannot grow buffer"
93-
];
94-
}
95-
}
9684
var new_buffer = Caml_string.caml_create_string(new_len);
9785
Bytes.blit(b[/* buffer */0], 0, new_buffer, 0, b[/* position */1]);
9886
b[/* buffer */0] = new_buffer;
@@ -150,7 +138,7 @@ function add_buffer(b, bs) {
150138
}
151139

152140
function add_channel(b, ic, len) {
153-
if (len < 0 || len > Sys.max_string_length) {
141+
if (len < 0) {
154142
throw [
155143
Caml_builtin_exceptions.invalid_argument,
156144
"Buffer.add_channel"
@@ -175,7 +163,7 @@ function closing(param) {
175163
Caml_builtin_exceptions.assert_failure,
176164
[
177165
"buffer.ml",
178-
115,
166+
126,
179167
9
180168
]
181169
];

‎lib/js/camlinternalFormat.js

+10-40
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
var Sys = require("./sys.js");
43
var Char = require("./char.js");
54
var Block = require("./block.js");
65
var Bytes = require("./bytes.js");
@@ -4331,7 +4330,7 @@ function fmt_ebb_of_string(legacy_behavior, str) {
43314330
Caml_builtin_exceptions.assert_failure,
43324331
[
43334332
"camlinternalFormat.ml",
4334-
2716,
4333+
2719,
43354334
28
43364335
]
43374336
];
@@ -4391,39 +4390,10 @@ function fmt_ebb_of_string(legacy_behavior, str) {
43914390
];
43924391
} else {
43934392
var new_acc = Caml_int32.imul(acc, 10) + (c - /* "0" */48 | 0) | 0;
4394-
if (new_acc > Sys.max_string_length) {
4395-
return Curry._3(failwith_message(/* Format */[
4396-
/* String_literal */Block.__(11, [
4397-
"invalid format ",
4398-
/* Caml_string */Block.__(3, [
4399-
/* No_padding */0,
4400-
/* String_literal */Block.__(11, [
4401-
": integer ",
4402-
/* Int */Block.__(4, [
4403-
/* Int_d */0,
4404-
/* No_padding */0,
4405-
/* No_precision */0,
4406-
/* String_literal */Block.__(11, [
4407-
" is greater than the limit ",
4408-
/* Int */Block.__(4, [
4409-
/* Int_d */0,
4410-
/* No_padding */0,
4411-
/* No_precision */0,
4412-
/* End_of_format */0
4413-
])
4414-
])
4415-
])
4416-
])
4417-
])
4418-
]),
4419-
"invalid format %S: integer %d is greater than the limit %d"
4420-
]), str, new_acc, Sys.max_string_length);
4421-
} else {
4422-
_acc = new_acc;
4423-
_str_ind = str_ind + 1 | 0;
4424-
continue ;
4425-
4426-
}
4393+
_acc = new_acc;
4394+
_str_ind = str_ind + 1 | 0;
4395+
continue ;
4396+
44274397
}
44284398
};
44294399
};
@@ -4935,7 +4905,7 @@ function fmt_ebb_of_string(legacy_behavior, str) {
49354905
Caml_builtin_exceptions.assert_failure,
49364906
[
49374907
"camlinternalFormat.ml",
4938-
2621,
4908+
2624,
49394909
11
49404910
]
49414911
];
@@ -4947,7 +4917,7 @@ function fmt_ebb_of_string(legacy_behavior, str) {
49474917
Caml_builtin_exceptions.assert_failure,
49484918
[
49494919
"camlinternalFormat.ml",
4950-
2621,
4920+
2624,
49514921
11
49524922
]
49534923
];
@@ -5070,7 +5040,7 @@ function fmt_ebb_of_string(legacy_behavior, str) {
50705040
Caml_builtin_exceptions.assert_failure,
50715041
[
50725042
"camlinternalFormat.ml",
5073-
2744,
5043+
2747,
50745044
25
50755045
]
50765046
];
@@ -5100,7 +5070,7 @@ function fmt_ebb_of_string(legacy_behavior, str) {
51005070
Caml_builtin_exceptions.assert_failure,
51015071
[
51025072
"camlinternalFormat.ml",
5103-
2744,
5073+
2747,
51045074
25
51055075
]
51065076
];
@@ -6177,7 +6147,7 @@ function fmt_ebb_of_string(legacy_behavior, str) {
61776147
Caml_builtin_exceptions.assert_failure,
61786148
[
61796149
"camlinternalFormat.ml",
6180-
2683,
6150+
2686,
61816151
34
61826152
]
61836153
];

‎lib/js/camlinternalOO.js

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
'use strict';
22

33
var Obj = require("./obj.js");
4-
var Sys = require("./sys.js");
54
var List = require("./list.js");
65
var $$Array = require("./array.js");
76
var Curry = require("./curry.js");
@@ -450,7 +449,7 @@ function new_table(pub_labels) {
450449
var len = pub_labels.length;
451450
var methods = Caml_array.caml_make_vect((len << 1) + 2 | 0, dummy_met);
452451
Caml_array.caml_array_set(methods, 0, len);
453-
Caml_array.caml_array_set(methods, 1, (Caml_int32.imul(fit_size(len), Sys.word_size) / 8 | 0) - 1 | 0);
452+
Caml_array.caml_array_set(methods, 1, ((fit_size(len) << 5) / 8 | 0) - 1 | 0);
454453
for(var i = 0 ,i_finish = len - 1 | 0; i <= i_finish; ++i){
455454
Caml_array.caml_array_set(methods, (i << 1) + 3 | 0, Caml_array.caml_array_get(pub_labels, i));
456455
}
@@ -710,7 +709,7 @@ function get_variable(table, name) {
710709
Caml_builtin_exceptions.assert_failure,
711710
[
712711
"camlinternalOO.ml",
713-
280,
712+
284,
714713
50
715714
]
716715
];
@@ -753,7 +752,7 @@ function create_table(public_methods) {
753752
function init_class(table) {
754753
inst_var_count[0] = (inst_var_count[0] + table[/* size */0] | 0) - 1 | 0;
755754
table[/* initializers */7] = List.rev(table[/* initializers */7]);
756-
return resize(table, 3 + ((Caml_array.caml_array_get(table[/* methods */1], 1) << 4) / Sys.word_size | 0) | 0);
755+
return resize(table, 3 + ((Caml_array.caml_array_get(table[/* methods */1], 1) << 4) / 32 | 0) | 0);
757756
}
758757

759758
function inherits(cla, vals, virt_meths, concr_meths, param, top) {
@@ -935,7 +934,7 @@ function lookup_tables(root, keys) {
935934

936935
function new_cache(table) {
937936
var n = new_method(table);
938-
var n$1 = n % 2 === 0 || n > (2 + ((Caml_array.caml_array_get(table[/* methods */1], 1) << 4) / Sys.word_size | 0) | 0) ? n : new_method(table);
937+
var n$1 = n % 2 === 0 || n > (2 + ((Caml_array.caml_array_get(table[/* methods */1], 1) << 4) / 32 | 0) | 0) ? n : new_method(table);
939938
Caml_array.caml_array_set(table[/* methods */1], n$1, 0);
940939
return n$1;
941940
}

‎lib/js/gc.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
var Sys = require("./sys.js");
43
var Block = require("./block.js");
54
var Curry = require("./curry.js");
65
var Printf = require("./printf.js");
@@ -237,7 +236,7 @@ function print_stat(c) {
237236

238237
function allocated_bytes() {
239238
var match = Caml_gc.caml_gc_counters(/* () */0);
240-
return (match[0] + match[2] - match[1]) * (Sys.word_size / 8 | 0);
239+
return (match[0] + match[2] - match[1]) * 1;
241240
}
242241

243242
function call_alarm(arec) {

‎lib/js/genlex.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -720,4 +720,4 @@ function make_lexer(keywords) {
720720
}
721721

722722
exports.make_lexer = make_lexer;
723-
/* Hashtbl Not a pure module */
723+
/* No side effect */

‎lib/js/hashtbl.js

+4-24
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
'use strict';
22

3-
var Sys = require("./sys.js");
43
var $$Array = require("./array.js");
54
var Block = require("./block.js");
6-
var Bytes = require("./bytes.js");
75
var Curry = require("./curry.js");
86
var Random = require("./random.js");
97
var Caml_obj = require("./caml_obj.js");
10-
var Caml_sys = require("./caml_sys.js");
118
var Caml_hash = require("./caml_hash.js");
129
var Caml_array = require("./caml_array.js");
1310
var Pervasives = require("./pervasives.js");
14-
var Caml_string = require("./caml_string.js");
1511
var CamlinternalLazy = require("./camlinternalLazy.js");
1612
var Caml_missing_polyfill = require("./caml_missing_polyfill.js");
1713
var Caml_builtin_exceptions = require("./caml_builtin_exceptions.js");
@@ -28,23 +24,7 @@ function seeded_hash(seed, x) {
2824
return Caml_hash.caml_hash(10, 100, seed, x);
2925
}
3026

31-
var params;
32-
33-
try {
34-
params = Caml_sys.caml_sys_getenv("OCAMLRUNPARAM");
35-
}
36-
catch (exn){
37-
try {
38-
params = Caml_sys.caml_sys_getenv("CAMLRUNPARAM");
39-
}
40-
catch (exn$1){
41-
params = "";
42-
}
43-
}
44-
45-
var randomized_default = Bytes.contains(Caml_string.bytes_of_string(params), /* "R" */82);
46-
47-
var randomized = [randomized_default];
27+
var randomized = [/* false */0];
4828

4929
function randomize() {
5030
randomized[0] = /* true */1;
@@ -60,7 +40,7 @@ function power_2_above(_x, n) {
6040
var x = _x;
6141
if (x >= n) {
6242
return x;
63-
} else if ((x << 1) > Sys.max_array_length) {
43+
} else if ((x << 1) < x) {
6444
return x;
6545
} else {
6646
_x = (x << 1);
@@ -127,7 +107,7 @@ function resize(indexfun, h) {
127107
var odata = h[/* data */1];
128108
var osize = odata.length;
129109
var nsize = (osize << 1);
130-
if (nsize < Sys.max_array_length) {
110+
if (nsize >= osize) {
131111
var ndata = Caml_array.caml_make_vect(nsize, /* Empty */0);
132112
h[/* data */1] = ndata;
133113
var insert_bucket = function (param) {
@@ -810,4 +790,4 @@ exports.hash = hash;
810790
exports.seeded_hash = seeded_hash;
811791
exports.hash_param = hash_param;
812792
exports.seeded_hash_param = seeded_hash_param;
813-
/* randomized_default Not a pure module */
793+
/* No side effect */

‎lib/js/lexing.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
var Sys = require("./sys.js");
43
var Bytes = require("./bytes.js");
54
var Curry = require("./curry.js");
65
var Caml_array = require("./caml_array.js");
@@ -60,7 +59,7 @@ function from_function(f) {
6059
if (((lexbuf[/* lex_buffer_len */2] - lexbuf[/* lex_start_pos */4] | 0) + n | 0) <= lexbuf[/* lex_buffer */1].length) {
6160
Bytes.blit(lexbuf[/* lex_buffer */1], lexbuf[/* lex_start_pos */4], lexbuf[/* lex_buffer */1], 0, lexbuf[/* lex_buffer_len */2] - lexbuf[/* lex_start_pos */4] | 0);
6261
} else {
63-
var newlen = Pervasives.min((lexbuf[/* lex_buffer */1].length << 1), Sys.max_string_length);
62+
var newlen = (lexbuf[/* lex_buffer */1].length << 1);
6463
if (((lexbuf[/* lex_buffer_len */2] - lexbuf[/* lex_start_pos */4] | 0) + n | 0) > newlen) {
6564
throw [
6665
Caml_builtin_exceptions.failure,

‎lib/js/moreLabels.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ var $$Set$1 = /* Set */[$$Set.Make];
3535
exports.Hashtbl = Hashtbl$1;
3636
exports.$$Map = $$Map$1;
3737
exports.$$Set = $$Set$1;
38-
/* Hashtbl Not a pure module */
38+
/* No side effect */

‎lib/js/nativeint.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
var Sys = require("./sys.js");
43
var Caml_obj = require("./caml_obj.js");
54
var Caml_format = require("./caml_format.js");
65

@@ -40,7 +39,7 @@ var one = 1;
4039

4140
var minus_one = -1;
4241

43-
var size = Sys.word_size;
42+
var size = 54;
4443

4544
exports.zero = zero;
4645
exports.one = one;

‎lib/js/weak.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
var Sys = require("./sys.js");
43
var $$Array = require("./array.js");
54
var Curry = require("./curry.js");
65
var Caml_obj = require("./caml_obj.js");
@@ -35,7 +34,7 @@ function Make(H) {
3534
};
3635
var create = function (sz) {
3736
var sz$1 = sz < 7 ? 7 : sz;
38-
var sz$2 = sz$1 > Sys.max_array_length ? Sys.max_array_length : sz$1;
37+
var sz$2 = sz$1 > 2147483647 ? 2147483647 : sz$1;
3938
return /* record */[
4039
/* table */Caml_array.caml_make_vect(sz$2, emptybucket),
4140
/* hashes */Caml_array.caml_make_vect(sz$2, /* int array */[]),
@@ -150,7 +149,7 @@ function Make(H) {
150149
}), t[/* table */0], 0);
151150
};
152151
var next_sz = function (n) {
153-
return Pervasives.min((Caml_int32.imul(3, n) / 2 | 0) + 3 | 0, Sys.max_array_length);
152+
return Pervasives.min((Caml_int32.imul(3, n) / 2 | 0) + 3 | 0, 2147483647);
154153
};
155154
var prev_sz = function (n) {
156155
return (((n - 3 | 0) << 1) + 2 | 0) / 3 | 0;
@@ -212,7 +211,7 @@ function Make(H) {
212211
while(true) {
213212
var i = _i;
214213
if (i >= sz) {
215-
var newsz = Pervasives.min((Caml_int32.imul(3, sz) / 2 | 0) + 3 | 0, Sys.max_array_length - 1 | 0);
214+
var newsz = Pervasives.min((Caml_int32.imul(3, sz) / 2 | 0) + 3 | 0, 2147483646);
216215
if (newsz <= sz) {
217216
throw [
218217
Caml_builtin_exceptions.failure,

0 commit comments

Comments
 (0)