BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lib/strings: Improve error message for octal ambiguity in toInt

Browse source
This commit is contained in:
Jacob Abel 2022-07-08 20:17:44 -04:00
parent 39a4ab78a1
commit 88b18dcf44
No known key found for this signature in database
GPG key ID: C41690827135AD22
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/strings.nix
View file

@ -800,8 +800,7 @@ rec {
=> 123 => 123
toInt "00024" toInt "00024"
=> error: [json.exception.parse_error.101] parse error at line 1, column 2: syntax error => error: Ambiguity in interpretation of 00024 between octal and zero padded integer.
while parsing value - unexpected number literal; expected end of input
toInt "3.14" toInt "3.14"
=> error: floating point JSON numbers are not supported => error: floating point JSON numbers are not supported
@ -821,7 +820,7 @@ rec {
parsedInput = fromJSON (elemAt strippedInput 0); parsedInput = fromJSON (elemAt strippedInput 0);
in in
if isLeadingZero if isLeadingZero
then throw "Ambiguity in ${str} between octal and zero padded integer." then throw "Ambiguity in interpretation of ${str} between octal and zero padded integer."
else if strippedInput != null && isInt parsedInput else if strippedInput != null && isInt parsedInput
then parsedInput then parsedInput
else throw "Could not convert ${str} to int."; else throw "Could not convert ${str} to int.";