---

yaml
---
r: 15477
b: refs/heads/try
c: 6b5731e
h: refs/heads/master
i:
  15475: 95b6b95
v: v3

Author: Grahame Bowland

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 658b6a741b7d2bd01c7e14211b4299f12c0a3ebf
+refs/heads/try: 6b5731e7045ce5ea3209f957d5275a765f883f26
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/float.rs

@@ -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.
 
@@ -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.
@@ -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;