bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Make 1.f parse as a field access on the integer 1

Browse source 
A dot is only considered part of a number when not followed by a letter

Closes #1306
This commit is contained in:
Marijn Haverbeke 2011-12-16 10:11:00 +01:00
parent 14fcb135a9
commit 4f826d81f6
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstd/json.rs
View file

@ -171,11 +171,11 @@ fn from_str_float(s: str) -> (option::t<json>, str) {
let pos = 0u;
let len = str::byte_len(s);
let res = 0f;
let neg = 1.f;
let neg = 1f;
alt str::char_at(s, 0u) {
'-' {
neg = -1.f;
neg = -1f;
pos = 1u;
}
'+' {
@ -205,7 +205,7 @@ fn from_str_float(s: str) -> (option::t<json>, str) {
ret (some(num(neg * res)), str::char_slice(s, pos, str::char_len(s)));
}
let dec = 1.f;
let dec = 1f;
while (pos < len) {
let opos = pos;
let chr = str::char_range_at(s, pos);
@ -213,7 +213,7 @@ fn from_str_float(s: str) -> (option::t<json>, str) {
pos = chr.next;
alt c {
'0' to '9' {
dec /= 10.f;
dec /= 10f;
res += (((c as int) - ('0' as int)) as float) * dec;
}
_ { ret (some(num(neg * res)),