vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

time: remove `err_invalid_8601 = error()` const, use a const string instead

pull/10134/head
Delyan Angelov 2021-05-18 12:32:09 +03:00
parent 453fb1b08b
commit f1174daabd
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vlib/time/parse.v
View File

@ -45,14 +45,14 @@ pub fn parse_rfc2822(s string) ?Time {
// ----- iso8601 ----- // ----- iso8601 -----
const ( const (
err_invalid_8601 = error('Invalid 8601 Format') err_invalid_8601 = 'Invalid 8601 Format'
) )
fn parse_iso8601_date(s string) ?(int, int, int) { fn parse_iso8601_date(s string) ?(int, int, int) {
year, month, day, dummy := 0, 0, 0, byte(0) year, month, day, dummy := 0, 0, 0, byte(0)
count := unsafe { C.sscanf(&char(s.str), c'%4d-%2d-%2d%c', &year, &month, &day, &dummy) } count := unsafe { C.sscanf(&char(s.str), c'%4d-%2d-%2d%c', &year, &month, &day, &dummy) }
if count != 3 { if count != 3 {
return time.err_invalid_8601 return error(time.err_invalid_8601)
} }
return year, month, day return year, month, day
} }
@ -78,12 +78,12 @@ fn parse_iso8601_time(s string) ?(int, int, int, int, i64, bool) {
count++ // Increment count because skipped microsecond count++ // Increment count because skipped microsecond
} }
if count < 4 { if count < 4 {
return time.err_invalid_8601 return error(time.err_invalid_8601)
} }
is_local_time := plus_min_z == `a` && count == 4 is_local_time := plus_min_z == `a` && count == 4
is_utc := plus_min_z == `Z` && count == 5 is_utc := plus_min_z == `Z` && count == 5
if !(count == 7 || is_local_time || is_utc) { if !(count == 7 || is_local_time || is_utc) {
return time.err_invalid_8601 return error(time.err_invalid_8601)
} }
if plus_min_z != `+` && plus_min_z != `-` && !is_utc && !is_local_time { if plus_min_z != `+` && plus_min_z != `-` && !is_utc && !is_local_time {
return error('Invalid 8601 format, expected `Z` or `+` or `-` as time separator') return error('Invalid 8601 format, expected `Z` or `+` or `-` as time separator')
@ -110,7 +110,7 @@ pub fn parse_iso8601(s string) ?Time {
t_i := s.index('T') or { -1 } t_i := s.index('T') or { -1 }
parts := if t_i != -1 { [s[..t_i], s[t_i + 1..]] } else { s.split(' ') } parts := if t_i != -1 { [s[..t_i], s[t_i + 1..]] } else { s.split(' ') }
if !(parts.len == 1 || parts.len == 2) { if !(parts.len == 1 || parts.len == 2) {
return time.err_invalid_8601 return error(time.err_invalid_8601)
} }
year, month, day := parse_iso8601_date(parts[0]) ? year, month, day := parse_iso8601_date(parts[0]) ?
mut hour_, mut minute_, mut second_, mut microsecond_, mut unix_offset, mut is_local_time := 0, 0, 0, 0, i64(0), true mut hour_, mut minute_, mut second_, mut microsecond_, mut unix_offset, mut is_local_time := 0, 0, 0, 0, i64(0), true