Skip to content
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.

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

add inf/-inf/NaN parsing to float::from_str #2205

Merged
merged 1 commit into from
Apr 14, 2012
Merged
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions src/libcore/float.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ This function accepts strings such as
* '', or, equivalently, '.' (understood as 0)
* '5.'
* '.5', or, equivalently, '0.5'
* 'inf', '-inf', 'NaN'

Leading and trailing whitespace are ignored.

Expand All @@ -123,6 +124,14 @@ Leading and trailing whitespace are ignored.
where `n` is the floating-point number represented by `[num]`.
"]
fn from_str(num: str) -> option<float> {
if num == "inf" {
ret some(infinity);
} else if num == "-inf" {
ret some(neg_infinity);
} else if num == "NaN" {
ret some(NaN);
}

let mut pos = 0u; //Current byte position in the string.
//Used to walk the string in O(n).
let len = str::len(num); //Length of the string, in bytes.
Expand Down Expand Up @@ -301,6 +310,15 @@ fn test_from_str() {
assert from_str("-.5") == some(-0.5);
assert from_str("-.5") == some(-0.5);
assert from_str("-5") == some(-5.);
assert from_str("-0") == some(-0.);
assert from_str("0") == some(0.);
assert from_str("inf") == some(infinity);
assert from_str("-inf") == some(neg_infinity);
// note: NaN != NaN, hence this slightly complex test
alt from_str("NaN") {
some(f) { assert is_NaN(f); }
none { fail; }
}

assert from_str("") == none;
assert from_str("x") == none;
Expand Down