---

yaml
---
r: 6050
b: refs/heads/master
c: 8c51d4b
h: refs/heads/master
v: v3

Author: mbrubeck

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bf10d84e2ec78c129f3fd04ed080d2d2038680f
+refs/heads/master: 8c51d4b002b2743fd50bc715429265aaaf482762

trunk/src/lib/float.rs

@@ -48,6 +48,8 @@ This function accepts strings such as
 * "5."
 * ".5", or, equivalently,  "0.5"
 
+Leading and trailing whitespace are ignored.
+
 Parameters:
 
 num - A string, possibly empty.
@@ -58,6 +60,8 @@ Returns:
 Otherwise, the floating-point number represented [num].
 */
 fn from_str(num: str) -> float {
+   num = str::trim(num);
+
    let pos = 0u;                  //Current byte position in the string.
                                   //Used to walk the string in O(n).
    let len = str::byte_len(num);  //Length of the string, in bytes.
@@ -66,6 +70,12 @@ fn from_str(num: str) -> float {
    let total = 0f;                //Accumulated result
    let c     = 'z';               //Latest char.
 
+   //The string must start with one of the following characters.
+   alt str::char_at(num, 0u) {
+      '-' | '+' | '0' to '9' | '.' {}
+      _ { ret NaN(); }
+   }
+
    //Determine if first char is '-'/'+'. Set [pos] and [neg] accordingly.
    let neg = false;               //Sign of the result
    alt str::char_at(num, 0u) {
@@ -89,9 +99,12 @@ fn from_str(num: str) -> float {
            total = total * 10f;
            total += ((c as int) - ('0' as int)) as float;
          }
-         _ {
+         '.' | 'e' | 'E' {
            break;
          }
+         _ {
+           ret NaN();
+         }
        }
    }
 
@@ -106,9 +119,12 @@ fn from_str(num: str) -> float {
                  decimal /= 10.f;
                  total += (((c as int) - ('0' as int)) as float)*decimal;
              }
-             _ {
+             'e' | 'E' {
                  break;
              }
+             _ {
+                 ret NaN();
+             }
          }
       }
    }
@@ -132,7 +148,6 @@ fn from_str(num: str) -> float {
           while(pos < len) {
              let char_range = str::char_range_at(num, pos);
              c = char_range.ch;
-             pos = char_range.next;
              alt c {
                  '0' | '1' | '2' | '3' | '4' | '5' | '6'| '7' | '8' | '9' {
                      exponent *= 10u;
@@ -142,6 +157,7 @@ fn from_str(num: str) -> float {
                      break;
                  }
              }
+             pos = char_range.next;
           }
           let multiplier = pow_uint_to_uint_as_float(10u, exponent);
               //Note: not [int::pow], otherwise, we'll quickly
@@ -151,6 +167,8 @@ fn from_str(num: str) -> float {
           } else {
              total = total * multiplier;
           }
+      } else {
+         ret NaN();
       }
    }
 

trunk/src/test/stdtest/float.rs

@@ -3,18 +3,39 @@ import std::float;
 
 #[test]
 fn test_from_str() {
+   assert ( float::from_str("3") == 3. );
+   assert ( float::from_str("  3  ") == 3. );
    assert ( float::from_str("3.14") == 3.14 );
    assert ( float::from_str("+3.14") == 3.14 );
    assert ( float::from_str("-3.14") == -3.14 );
    assert ( float::from_str("2.5E10") == 25000000000. );
    assert ( float::from_str("2.5e10") == 25000000000. );
    assert ( float::from_str("25000000000.E-10") == 2.5 );
    assert ( float::from_str("") == 0. );
-   assert ( float::isNaN(float::from_str("   ")) );
    assert ( float::from_str(".") == 0. );
+   assert ( float::from_str(".e1") == 0. );
+   assert ( float::from_str(".e-1") == 0. );
    assert ( float::from_str("5.") == 5. );
    assert ( float::from_str(".5") == 0.5 );
    assert ( float::from_str("0.5") == 0.5 );
+   assert ( float::from_str("0.5 ") == 0.5 );
+   assert ( float::from_str(" 0.5 ") == 0.5 );
+   assert ( float::from_str(" -.5 ") == -0.5 );
+   assert ( float::from_str(" -.5 ") == -0.5 );
+   assert ( float::from_str(" -5 ") == -5. );
+
+   assert ( float::isNaN(float::from_str("x")) );
+   assert ( float::from_str(" ") == 0. );
+   assert ( float::from_str("   ") == 0. );
+   assert ( float::from_str(" 0.5") == 0.5 );
+   assert ( float::from_str(" 0.5 ") == 0.5 );
+   assert ( float::from_str(" .1 ") == 0.1 );
+   assert ( float::isNaN(float::from_str("e")) );
+   assert ( float::isNaN(float::from_str("E")) );
+   assert ( float::isNaN(float::from_str("E1")) );
+   assert ( float::isNaN(float::from_str("1e1e1")) );
+   assert ( float::isNaN(float::from_str("1e1.1")) );
+   assert ( float::isNaN(float::from_str("1e1-1")) );
 }
 
 #[test]