Skip to content

Commit f2b4241

Browse files
bloodyowlbloodyowl
committed
Handle failed parsing
1 parent 9488542 commit f2b4241

10 files changed

+91
-43
lines changed

‎jscomp/others/belt_Float.ml

+7
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,19 @@
2626
Utililites for Float
2727
*)
2828

29+
external nan : float = "NaN" [@@bs.val] [@@bs.scope "Number"]
30+
2931
external toInt: float -> int = "%intoffloat"
3032

3133
external fromInt: int -> float = "%identity"
3234

3335
external fromString: string -> float = "parseFloat" [@@bs.val]
3436

37+
let fromString i =
38+
match (fromString i) with
39+
| i when i = nan -> None
40+
| i -> Some i
41+
3542
external toString: float -> string = "String" [@@bs.val]
3643

3744
external ( + ) : float -> float -> float = "%addfloat"

‎jscomp/others/belt_Float.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ external toInt: float -> int = "%intoffloat"
3030

3131
external fromInt: int -> float = "%identity"
3232

33-
external fromString: string -> float = "parseFloat" [@@bs.val]
33+
val fromString: string -> float option
3434

3535
external toString: float -> string = "String" [@@bs.val]
3636

‎jscomp/others/belt_Int.ml

+7
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,19 @@
2626
Utililites for Int
2727
*)
2828

29+
external nan : int = "NaN" [@@bs.val] [@@bs.scope "Number"]
30+
2931
external toFloat: int -> float = "%identity"
3032

3133
external fromFloat: float -> int = "%intoffloat"
3234

3335
external fromString: string -> (_ [@bs.as 10]) -> int = "parseInt" [@@bs.val]
3436

37+
let fromString i =
38+
match fromString i with
39+
| i when i = nan -> None
40+
| i -> Some i
41+
3542
external toString: int -> string = "String" [@@bs.val]
3643

3744
external ( + ) : int -> int -> int = "%addint"

‎jscomp/others/belt_Int.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ external toFloat: int -> float = "%identity"
3030

3131
external fromFloat: float -> int = "%intoffloat"
3232

33-
external fromString: string -> (_ [@bs.as 10]) -> int = "parseInt" [@@bs.val]
33+
val fromString: string -> int option
3434

3535
external toString: int -> string = "String" [@@bs.val]
3636

‎jscomp/test/bs_float_test.js

+17-14
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
var Mt = require("./mt.js");
44
var Block = require("../../lib/js/block.js");
5+
var Belt_Float = require("../../lib/js/belt_Float.js");
56

67
var suites = /* record */[/* contents : [] */0];
78

@@ -52,33 +53,35 @@ eq("File \"bs_float_test.ml\", line 22, characters 5-12", -1, -1);
5253

5354
eq("File \"bs_float_test.ml\", line 23, characters 5-12", -1, -1);
5455

55-
eq("File \"bs_float_test.ml\", line 26, characters 5-12", parseFloat("1"), 1.0);
56+
eq("File \"bs_float_test.ml\", line 26, characters 5-12", Belt_Float.fromString("1"), 1.0);
5657

57-
eq("File \"bs_float_test.ml\", line 27, characters 5-12", parseFloat("-1"), -1.0);
58+
eq("File \"bs_float_test.ml\", line 27, characters 5-12", Belt_Float.fromString("-1"), -1.0);
5859

59-
eq("File \"bs_float_test.ml\", line 28, characters 5-12", parseFloat("1.7"), 1.7);
60+
eq("File \"bs_float_test.ml\", line 28, characters 5-12", Belt_Float.fromString("1.7"), 1.7);
6061

61-
eq("File \"bs_float_test.ml\", line 29, characters 5-12", parseFloat("-1.0"), -1.0);
62+
eq("File \"bs_float_test.ml\", line 29, characters 5-12", Belt_Float.fromString("-1.0"), -1.0);
6263

63-
eq("File \"bs_float_test.ml\", line 30, characters 5-12", parseFloat("-1.5"), -1.5);
64+
eq("File \"bs_float_test.ml\", line 30, characters 5-12", Belt_Float.fromString("-1.5"), -1.5);
6465

65-
eq("File \"bs_float_test.ml\", line 31, characters 5-12", parseFloat("-1.7"), -1.7);
66+
eq("File \"bs_float_test.ml\", line 31, characters 5-12", Belt_Float.fromString("-1.7"), -1.7);
6667

67-
eq("File \"bs_float_test.ml\", line 34, characters 5-12", String(1.0), "1");
68+
eq("File \"bs_float_test.ml\", line 32, characters 5-12", Belt_Float.fromString("not a float"), undefined);
6869

69-
eq("File \"bs_float_test.ml\", line 35, characters 5-12", String(-1.0), "-1");
70+
eq("File \"bs_float_test.ml\", line 35, characters 5-12", String(1.0), "1");
7071

71-
eq("File \"bs_float_test.ml\", line 36, characters 5-12", String(-1.5), "-1.5");
72+
eq("File \"bs_float_test.ml\", line 36, characters 5-12", String(-1.0), "-1");
7273

73-
eq("File \"bs_float_test.ml\", line 40, characters 5-12", 2.0 + 3.0, 5.0);
74+
eq("File \"bs_float_test.ml\", line 37, characters 5-12", String(-1.5), "-1.5");
7475

75-
eq("File \"bs_float_test.ml\", line 41, characters 5-12", 2.0 - 3.0, -1.0);
76+
eq("File \"bs_float_test.ml\", line 41, characters 5-12", 2.0 + 3.0, 5.0);
7677

77-
eq("File \"bs_float_test.ml\", line 42, characters 5-12", 2.0 * 3.0, 6.0);
78+
eq("File \"bs_float_test.ml\", line 42, characters 5-12", 2.0 - 3.0, -1.0);
7879

79-
eq("File \"bs_float_test.ml\", line 43, characters 5-12", 3.0 / 2.0, 1.5);
80+
eq("File \"bs_float_test.ml\", line 43, characters 5-12", 2.0 * 3.0, 6.0);
8081

81-
Mt.from_pair_suites("File \"bs_float_test.ml\", line 45, characters 23-30", suites[0]);
82+
eq("File \"bs_float_test.ml\", line 44, characters 5-12", 3.0 / 2.0, 1.5);
83+
84+
Mt.from_pair_suites("File \"bs_float_test.ml\", line 46, characters 23-30", suites[0]);
8285

8386
var F = 0;
8487

‎jscomp/test/bs_float_test.ml

+7-6
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ let () =
2323
eq __LOC__ (F.toInt (-1.7)) (-1)
2424

2525
let () =
26-
eq __LOC__ (F.fromString "1") 1.0;
27-
eq __LOC__ (F.fromString "-1") (-1.0);
28-
eq __LOC__ (F.fromString "1.7") 1.7;
29-
eq __LOC__ (F.fromString "-1.0") (-1.0);
30-
eq __LOC__ (F.fromString "-1.5") (-1.5);
31-
eq __LOC__ (F.fromString "-1.7") (-1.7)
26+
eq __LOC__ (F.fromString "1") (Some 1.0);
27+
eq __LOC__ (F.fromString "-1") (Some (-1.0));
28+
eq __LOC__ (F.fromString "1.7") (Some 1.7);
29+
eq __LOC__ (F.fromString "-1.0") (Some (-1.0));
30+
eq __LOC__ (F.fromString "-1.5") (Some (-1.5));
31+
eq __LOC__ (F.fromString "-1.7") (Some (-1.7));
32+
eq __LOC__ (F.fromString "not a float") None
3233

3334
let () =
3435
eq __LOC__ (F.toString 1.0) "1";

‎jscomp/test/bs_int_test.js

+16-13
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
var Mt = require("./mt.js");
44
var Block = require("../../lib/js/block.js");
5+
var Belt_Int = require("../../lib/js/belt_Int.js");
56

67
var suites = /* record */[/* contents : [] */0];
78

@@ -52,31 +53,33 @@ eq("File \"bs_int_test.ml\", line 22, characters 5-12", -1, -1);
5253

5354
eq("File \"bs_int_test.ml\", line 23, characters 5-12", -1, -1);
5455

55-
eq("File \"bs_int_test.ml\", line 26, characters 5-12", parseInt("1", 10), 1);
56+
eq("File \"bs_int_test.ml\", line 26, characters 5-12", Belt_Int.fromString("1"), 1);
5657

57-
eq("File \"bs_int_test.ml\", line 27, characters 5-12", parseInt("-1", 10), -1);
58+
eq("File \"bs_int_test.ml\", line 27, characters 5-12", Belt_Int.fromString("-1"), -1);
5859

59-
eq("File \"bs_int_test.ml\", line 28, characters 5-12", parseInt("1.7", 10), 1);
60+
eq("File \"bs_int_test.ml\", line 28, characters 5-12", Belt_Int.fromString("1.7"), 1);
6061

61-
eq("File \"bs_int_test.ml\", line 29, characters 5-12", parseInt("-1.0", 10), -1);
62+
eq("File \"bs_int_test.ml\", line 29, characters 5-12", Belt_Int.fromString("-1.0"), -1);
6263

63-
eq("File \"bs_int_test.ml\", line 30, characters 5-12", parseInt("-1.5", 10), -1);
64+
eq("File \"bs_int_test.ml\", line 30, characters 5-12", Belt_Int.fromString("-1.5"), -1);
6465

65-
eq("File \"bs_int_test.ml\", line 31, characters 5-12", parseInt("-1.7", 10), -1);
66+
eq("File \"bs_int_test.ml\", line 31, characters 5-12", Belt_Int.fromString("-1.7"), -1);
6667

67-
eq("File \"bs_int_test.ml\", line 34, characters 5-12", String(1), "1");
68+
eq("File \"bs_int_test.ml\", line 32, characters 5-12", Belt_Int.fromString("not an int"), undefined);
6869

69-
eq("File \"bs_int_test.ml\", line 35, characters 5-12", String(-1), "-1");
70+
eq("File \"bs_int_test.ml\", line 35, characters 5-12", String(1), "1");
7071

71-
eq("File \"bs_int_test.ml\", line 39, characters 5-12", 5, 5);
72+
eq("File \"bs_int_test.ml\", line 36, characters 5-12", String(-1), "-1");
7273

73-
eq("File \"bs_int_test.ml\", line 40, characters 5-12", -1, -1);
74+
eq("File \"bs_int_test.ml\", line 40, characters 5-12", 5, 5);
7475

75-
eq("File \"bs_int_test.ml\", line 41, characters 5-12", 6, 6);
76+
eq("File \"bs_int_test.ml\", line 41, characters 5-12", -1, -1);
7677

77-
eq("File \"bs_int_test.ml\", line 42, characters 5-12", 0, 0);
78+
eq("File \"bs_int_test.ml\", line 42, characters 5-12", 6, 6);
7879

79-
Mt.from_pair_suites("File \"bs_int_test.ml\", line 44, characters 23-30", suites[0]);
80+
eq("File \"bs_int_test.ml\", line 43, characters 5-12", 0, 0);
81+
82+
Mt.from_pair_suites("File \"bs_int_test.ml\", line 45, characters 23-30", suites[0]);
8083

8184
var I = 0;
8285

‎jscomp/test/bs_int_test.ml

+7-6
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ let () =
2323
eq __LOC__ (I.fromFloat (-1.7)) (-1)
2424

2525
let () =
26-
eq __LOC__ (I.fromString "1") 1;
27-
eq __LOC__ (I.fromString "-1") (-1);
28-
eq __LOC__ (I.fromString "1.7") 1;
29-
eq __LOC__ (I.fromString "-1.0") (-1);
30-
eq __LOC__ (I.fromString "-1.5") (-1);
31-
eq __LOC__ (I.fromString "-1.7") (-1)
26+
eq __LOC__ (I.fromString "1") (Some 1);
27+
eq __LOC__ (I.fromString "-1") (Some (-1));
28+
eq __LOC__ (I.fromString "1.7") (Some 1);
29+
eq __LOC__ (I.fromString "-1.0") (Some (-1));
30+
eq __LOC__ (I.fromString "-1.5") (Some (-1));
31+
eq __LOC__ (I.fromString "-1.7") (Some (-1));
32+
eq __LOC__ (I.fromString "not an int") None
3233

3334
let () =
3435
eq __LOC__ (I.toString 1) "1";

‎lib/js/belt_Float.js

+14-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,14 @@
1-
/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
1+
'use strict';
2+
3+
4+
function fromString(i) {
5+
var i$1 = parseFloat(i);
6+
if (i$1 === Number.NaN) {
7+
return undefined;
8+
} else {
9+
return i$1;
10+
}
11+
}
12+
13+
exports.fromString = fromString;
14+
/* No side effect */

‎lib/js/belt_Int.js

+14-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,14 @@
1-
/* This output is empty. Its source's type definitions, externals and/or unused code got optimized away. */
1+
'use strict';
2+
3+
4+
function fromString(i) {
5+
var i$1 = parseInt(i, 10);
6+
if (i$1 === Number.NaN) {
7+
return undefined;
8+
} else {
9+
return i$1;
10+
}
11+
}
12+
13+
exports.fromString = fromString;
14+
/* No side effect */

0 commit comments

Comments
 (0)