Skip to content

Commit a0876b3

Browse files
sneivandtsparkprime
sneivandt
authored and
sparkprime
committed
update std.parseInt error messages
1 parent 81c8242 commit a0876b3

10 files changed

+31
-29
lines changed

‎stdlib/std.jsonnet

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ limitations under the License.
8181
std.foldl(addDigit, std.stringChars(str), 0),
8282

8383
parseInt(str)::
84+
assert std.isString(str): 'Expected string, got ' + std.type(str);
85+
assert std.length(str) > 0 && str != "-": 'Not an integer: "%s"' % [str];
8486
if str[0] == '-' then
8587
-parse_nat(str[1:], 10)
8688
else

‎test_suite/error.equality_function.jsonnet.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
RUNTIME ERROR: cannot test equality of functions
2-
std.jsonnet:1221:9-34 function <anonymous>
2+
std.jsonnet:1223:9-34 function <anonymous>
33
error.equality_function.jsonnet:17:1-33

‎test_suite/error.inside_equals_array.jsonnet.golden

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
RUNTIME ERROR: foobar
22
error.inside_equals_array.jsonnet:18:18-32 thunk <array_element>
3-
std.jsonnet:1201:29-33 thunk <b>
4-
std.jsonnet:1201:21-33 function <anonymous>
5-
std.jsonnet:1201:21-33 function <aux>
6-
std.jsonnet:1204:15-31 function <anonymous>
7-
std.jsonnet:1205:11-23
3+
std.jsonnet:1203:29-33 thunk <b>
4+
std.jsonnet:1203:21-33 function <anonymous>
5+
std.jsonnet:1203:21-33 function <aux>
6+
std.jsonnet:1206:15-31 function <anonymous>
7+
std.jsonnet:1207:11-23

‎test_suite/error.inside_equals_object.jsonnet.golden

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
RUNTIME ERROR: foobar
22
error.inside_equals_object.jsonnet:18:22-36 object <b>
3-
std.jsonnet:1215:50-54 thunk <b>
4-
std.jsonnet:1215:42-54 function <anonymous>
5-
std.jsonnet:1215:42-54 function <aux>
6-
std.jsonnet:1218:15-31 function <anonymous>
7-
std.jsonnet:1219:11-23
3+
std.jsonnet:1217:50-54 thunk <b>
4+
std.jsonnet:1217:42-54 function <anonymous>
5+
std.jsonnet:1217:42-54 function <aux>
6+
std.jsonnet:1220:15-31 function <anonymous>
7+
std.jsonnet:1221:11-23

‎test_suite/error.invariant.equality.jsonnet.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RUNTIME ERROR: Object assertion failed.
22
error.invariant.equality.jsonnet:17:10-15 thunk <object_assert>
3-
std.jsonnet:1215:42-46 thunk <a>
4-
std.jsonnet:1215:42-54 function <anonymous>
5-
std.jsonnet:1215:42-54 function <anonymous>
6-
std.jsonnet:1219:11-23
3+
std.jsonnet:1217:42-46 thunk <a>
4+
std.jsonnet:1217:42-54 function <anonymous>
5+
std.jsonnet:1217:42-54 function <anonymous>
6+
std.jsonnet:1221:11-23

‎test_suite/error.obj_assert.fail1.jsonnet.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RUNTIME ERROR: Object assertion failed.
22
error.obj_assert.fail1.jsonnet:20:23-29 thunk <object_assert>
3-
std.jsonnet:1215:42-46 thunk <a>
4-
std.jsonnet:1215:42-54 function <anonymous>
5-
std.jsonnet:1215:42-54 function <anonymous>
6-
std.jsonnet:1219:11-23
3+
std.jsonnet:1217:42-46 thunk <a>
4+
std.jsonnet:1217:42-54 function <anonymous>
5+
std.jsonnet:1217:42-54 function <anonymous>
6+
std.jsonnet:1221:11-23

‎test_suite/error.obj_assert.fail2.jsonnet.golden

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
RUNTIME ERROR: foo was not equal to bar
22
error.obj_assert.fail2.jsonnet:20:32-65 thunk <object_assert>
3-
std.jsonnet:1215:42-46 thunk <a>
4-
std.jsonnet:1215:42-54 function <anonymous>
5-
std.jsonnet:1215:42-54 function <anonymous>
6-
std.jsonnet:1219:11-23
3+
std.jsonnet:1217:42-46 thunk <a>
4+
std.jsonnet:1217:42-54 function <anonymous>
5+
std.jsonnet:1217:42-54 function <anonymous>
6+
std.jsonnet:1221:11-23

‎test_suite/error.sanity.jsonnet.golden

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
RUNTIME ERROR: Assertion failed. 1 != 2
2-
std.jsonnet:780:7-50 function <anonymous>
2+
std.jsonnet:782:7-50 function <anonymous>
33
error.sanity.jsonnet:17:1-22

‎test_suite/error.std_join_types1.jsonnet.golden

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
RUNTIME ERROR: expected string but arr[1] was array
2-
std.jsonnet:260:9-87 function <aux>
3-
std.jsonnet:262:9-49 function <aux>
4-
std.jsonnet:268:7-28 function <anonymous>
2+
std.jsonnet:262:9-87 function <aux>
3+
std.jsonnet:264:9-49 function <aux>
4+
std.jsonnet:270:7-28 function <anonymous>
55
error.std_join_types1.jsonnet:17:1-26

‎test_suite/error.std_join_types2.jsonnet.golden

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
RUNTIME ERROR: expected array but arr[0] was string
2-
std.jsonnet:260:9-87 function <aux>
3-
std.jsonnet:270:7-28 function <anonymous>
2+
std.jsonnet:262:9-87 function <aux>
3+
std.jsonnet:272:7-28 function <anonymous>
44
error.std_join_types2.jsonnet:17:1-31

0 commit comments

Comments
 (0)