squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge pull request #5178 from catamorphism/constant-buffers

Browse source 
core: Address XXX, make static constants for strings used when stringify...
This commit is contained in:
Patrick Walton 2013-03-01 08:44:47 -08:00
parent 02a4b5bed3 405a35c7f8
commit 50c08dbf0d
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libcore/num/strconv.rs
View file

@ -478,17 +478,16 @@ pub pure fn from_str_bytes_common<T:NumCast+Zero+One+Ord+Copy+Div<T,T>+
} }
} }
// XXX: Bytevector constant from str
if special { if special {
if buf == str::to_bytes("inf") || buf == str::to_bytes("+inf") { if buf == str::inf_buf || buf == str::positive_inf_buf {
return NumStrConv::inf(); return NumStrConv::inf();
} else if buf == str::to_bytes("-inf") { } else if buf == str::negative_inf_buf {
if negative { if negative {
return NumStrConv::neg_inf(); return NumStrConv::neg_inf();
} else { } else {
return None; return None;
} }
} else if buf == str::to_bytes("NaN") { } else if buf == str::nan_buf {
return NumStrConv::NaN(); return NumStrConv::NaN();
} }
} }

7
src/libcore/str.rs
View file

@ -1832,6 +1832,13 @@ const tag_five_b: uint = 248u;
const max_five_b: uint = 67108864u; const max_five_b: uint = 67108864u;
const tag_six_b: uint = 252u; const tag_six_b: uint = 252u;
// Constants used for converting strs to floats
pub const inf_buf: [u8*3] = ['i' as u8, 'n' as u8, 'f' as u8];
pub const positive_inf_buf: [u8*4] = ['+' as u8, 'i' as u8,
'n' as u8, 'f' as u8];
pub const negative_inf_buf: [u8*4] = ['-' as u8, 'i' as u8,
'n' as u8, 'f' as u8];
pub const nan_buf: [u8*3] = ['N' as u8, 'a' as u8, 'N' as u8];
/** /**
* Work with the byte buffer of a string. * Work with the byte buffer of a string.