Store fractional seconds as a u32 instead of a f64

Drops precision down to the nanoseconds
This commit is contained in:
Alan Du 2017-06-01 23:22:35 +01:00
parent ce7b96c47b
commit 5d36195f2d
3 changed files with 25 additions and 26 deletions

View file

@ -55,7 +55,7 @@ struct Time {
hour: u8, hour: u8,
minute: u8, minute: u8,
second: u8, second: u8,
secfract: f64, nanosecond: u32,
} }
#[derive(PartialEq, Clone)] #[derive(PartialEq, Clone)]
@ -97,9 +97,9 @@ impl fmt::Display for Date {
impl fmt::Display for Time { impl fmt::Display for Time {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{:02}:{:02}:{:02}", self.hour, self.minute, self.second)?; write!(f, "{:02}:{:02}:{:02}", self.hour, self.minute, self.second)?;
if self.secfract != 0.0 { if self.nanosecond != 0 {
let s = format!("{}", self.secfract); let s = format!("{:09}", self.nanosecond);
write!(f, "{}", s.trim_left_matches("0"))?; write!(f, ".{}", s.trim_right_matches('0'))?;
} }
Ok(()) Ok(())
} }
@ -199,41 +199,37 @@ impl FromStr for Datetime {
let s1 = digit(&mut chars)?; let s1 = digit(&mut chars)?;
let s2 = digit(&mut chars)?; let s2 = digit(&mut chars)?;
let secfract = if chars.clone().next() == Some('.') { let mut nanosecond = 0;
if chars.clone().next() == Some('.') {
chars.next(); chars.next();
let mut first = true;
let whole = chars.as_str(); let whole = chars.as_str();
let mut end = whole.len(); let mut end = whole.len();
for (i, c) in whole.char_indices() { for (i, byte) in whole.bytes().enumerate() {
match c { match byte {
'0' ... '9' => {} b'0' ... b'9' => {
if i < 9 {
let p = 10_u32.pow(8 - i as u32);
nanosecond += p * (byte - b'0') as u32;
}
}
_ => { _ => {
end = i; end = i;
break break;
} }
} }
first = false;
} }
if first { if end == 0 {
return Err(DatetimeParseError { _private: () }) return Err(DatetimeParseError { _private: () })
} }
chars = whole[end..].chars(); chars = whole[end..].chars();
}
// truncate to picoseconds precision
let last = if end > 12 { 12 } else { end };
match format!("0.{}", &whole[..last]).parse() {
Ok(f) => f,
Err(_) => return Err(DatetimeParseError { _private: () }),
}
} else {
0.0
};
let time = Time { let time = Time {
hour: h1 * 10 + h2, hour: h1 * 10 + h2,
minute: m1 * 10 + m2, minute: m1 * 10 + m2,
second: s1 * 10 + s2, second: s1 * 10 + s2,
secfract: secfract, nanosecond: nanosecond,
}; };
if time.hour > 24 { if time.hour > 24 {
@ -242,7 +238,10 @@ impl FromStr for Datetime {
if time.minute > 59 { if time.minute > 59 {
return Err(DatetimeParseError { _private: () }) return Err(DatetimeParseError { _private: () })
} }
if time.second > 60 { if time.second > 59 {
return Err(DatetimeParseError { _private: () })
}
if time.nanosecond > 999_999_999 {
return Err(DatetimeParseError { _private: () }) return Err(DatetimeParseError { _private: () })
} }

View file

@ -463,7 +463,7 @@ fn datetimes() {
t!("2016-09-09T09:09:09Z"); t!("2016-09-09T09:09:09Z");
t!("2016-09-09T09:09:09.1Z"); t!("2016-09-09T09:09:09.1Z");
t!("2016-09-09T09:09:09.2+10:00"); t!("2016-09-09T09:09:09.2+10:00");
t!("2016-09-09T09:09:09.0123456789-02:00"); t!("2016-09-09T09:09:09.123456789-02:00");
bad!("foo = 2016-09-09T09:09:09.Z", "failed to parse date"); bad!("foo = 2016-09-09T09:09:09.Z", "failed to parse date");
bad!("foo = 2016-9-09T09:09:09Z", "failed to parse date"); bad!("foo = 2016-9-09T09:09:09Z", "failed to parse date");
bad!("foo = 2016-09-09T09:09:09+2:00", "failed to parse date"); bad!("foo = 2016-09-09T09:09:09+2:00", "failed to parse date");

View file

@ -1,6 +1,6 @@
{ {
"bestdayever": { "bestdayever": {
"type": "datetime", "type": "datetime",
"value": "1987-07-05T17:45:00.123456789012Z" "value": "1987-07-05T17:45:00.123456789Z"
} }
} }