mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved float str buffer constants to the strconv module

Browse Source
This commit is contained in:
Marvin Löbel 2013-03-22 02:04:13 +01:00
parent 51eb7dc8a7
commit 624a685283
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libcore/num/strconv.rs
View File

@ -130,6 +130,13 @@ impl_NumStrConv_Integer!(u16)
impl_NumStrConv_Integer!(u32)
impl_NumStrConv_Integer!(u64)
// Special value strings as [u8] consts.
const inf_buf: [u8*3] = ['i' as u8, 'n' as u8, 'f' as u8];
const positive_inf_buf: [u8*4] = ['+' as u8, 'i' as u8, 'n' as u8, 'f' as u8];
const negative_inf_buf: [u8*4] = ['-' as u8, 'i' as u8, 'n' as u8, 'f' as u8];
const nan_buf: [u8*3] = ['N' as u8, 'a' as u8, 'N' as u8];
/**
* Converts a number to its string representation as a byte vector.
* This is meant to be a common base implementation for all numeric string
@ -479,15 +486,15 @@ pub fn from_str_bytes_common<T:NumCast+Zero+One+Ord+Copy+Div<T,T>+
}
if special {
if buf == str::inf_buf || buf == str::positive_inf_buf {
if buf == inf_buf || buf == positive_inf_buf {
return NumStrConv::inf();
} else if buf == str::negative_inf_buf {
} else if buf == negative_inf_buf {
if negative {
return NumStrConv::neg_inf();
} else {
return None;
}
} else if buf == str::nan_buf {
} else if buf == nan_buf {
return NumStrConv::NaN();
}
}

8
src/libcore/str.rs
View File

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