Skip to content

Runtime: fix #1630 #1633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2024
Merged

Runtime: fix #1630 #1633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions compiler/tests-jsoo/test_ints.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,13 @@ let%expect_test _ =
[%expect {| -123 |}];
Printf.printf "%d\n" (int_of_string "-0U123");
[%expect {| -123 |}]

let%expect_test _ =
Printf.printf "%ld\n" (Int32.of_string "-0u2147483648");
[%expect {| -2147483648 |}];
Printf.printf "%ld\n" (Int32.of_string "-0u2147483648");
[%expect {| -2147483648 |}];
Printf.printf "%ld\n" (Int32.of_string "0u2147483648");
[%expect {| -2147483648 |}];
Printf.printf "%ld\n" (Int32.of_string "0u2147483648");
[%expect {| -2147483648 |}]
16 changes: 8 additions & 8 deletions runtime/ints.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function caml_format_int(fmt, i) {
//Provides: caml_parse_sign_and_base
//Requires: caml_string_unsafe_get, caml_ml_string_length
function caml_parse_sign_and_base (s) {
var i = 0, len = caml_ml_string_length(s), base = 10, sign = 1;
var i = 0, len = caml_ml_string_length(s), base = 10, sign = 1, signedness = 1;
if (len > 0) {
switch (caml_string_unsafe_get(s,i)) {
case 45: i++; sign = -1; break;
Expand All @@ -43,12 +43,12 @@ function caml_parse_sign_and_base (s) {
}
if (i + 1 < len && caml_string_unsafe_get(s, i) == 48)
switch (caml_string_unsafe_get(s, i + 1)) {
case 120: case 88: base = 16; i += 2; break;
case 111: case 79: base = 8; i += 2; break;
case 98: case 66: base = 2; i += 2; break;
case 117: case 85: i += 2; break;
case 120: case 88: signedness = 0; base = 16; i += 2; break;
case 111: case 79: signedness = 0; base = 8; i += 2; break;
case 98: case 66: signedness = 0; base = 2; i += 2; break;
case 117: case 85: signedness = 0; i += 2; break;
}
return [i, sign, base];
return [i, sign, base, signedness];
}

//Provides: caml_parse_digit
Expand All @@ -64,7 +64,7 @@ function caml_parse_digit(c) {
//Requires: caml_parse_sign_and_base, caml_parse_digit, caml_failwith
function caml_int_of_string (s) {
var r = caml_parse_sign_and_base (s);
var i = r[0], sign = r[1], base = r[2];
var i = r[0], sign = r[1], base = r[2], signedness = r[3];
var len = caml_ml_string_length(s);
var threshold = -1 >>> 0;
var c = (i < len)?caml_string_unsafe_get(s, i):0;
Expand All @@ -84,7 +84,7 @@ function caml_int_of_string (s) {
// hence any value of 'res' (less than 'threshold') is acceptable.
// But we have to convert the result back to a signed integer.
res = sign * res;
if ((base == 10) && ((res | 0) != res))
if (signedness && ((res | 0) != res))
/* Signed representation expected, allow -2^(nbits-1) to 2^(nbits-1) - 1 */
caml_failwith("int_of_string");
return res | 0;
Expand Down