toml: don't use time.Time for time representation (#12498)
Larpon
GitHub
parent
b5e410e408
commit
409321327b
|
|
@ -3,12 +3,14 @@
|
|||
// that can be found in the LICENSE file.
|
||||
module toml
|
||||
|
||||
import time
|
||||
import toml.util
|
||||
import x.json2
|
||||
|
||||
// Pretty much all the same builtin types as the `json2.Any` type plus `time.Time`
|
||||
pub type Any = Null
|
||||
// Pretty much all the same builtin types as the `json2.Any` type plus `DateTime`,`Date`,`Time`
|
||||
pub type Any = Date
|
||||
| DateTime
|
||||
| Null
|
||||
| Time
|
||||
| []Any
|
||||
| bool
|
||||
| f32
|
||||
|
|
@ -17,7 +19,6 @@ pub type Any = Null
|
|||
| int
|
||||
| map[string]Any
|
||||
| string
|
||||
| time.Time
|
||||
| u64
|
||||
|
||||
// string returns `Any` as a string.
|
||||
|
|
@ -28,7 +29,9 @@ pub fn (a Any) string() string {
|
|||
// ... certain call-patterns to this function will cause a memory corruption.
|
||||
// See `tests/toml_memory_corruption_test.v` for a matching regression test.
|
||||
string { return (a as string).clone() }
|
||||
time.Time { return a.format_ss_micro() }
|
||||
DateTime { return a.str() }
|
||||
Date { return a.str() }
|
||||
Time { return a.str() }
|
||||
else { return a.str() }
|
||||
}
|
||||
}
|
||||
|
|
@ -122,33 +125,30 @@ pub fn (a Any) bool() bool {
|
|||
}
|
||||
}
|
||||
|
||||
// date returns `Any` as a date encoded in a `time.Time` struct.
|
||||
pub fn (a Any) date() time.Time {
|
||||
mut time := time.Time{}
|
||||
// date returns `Any` as a `toml.Date` struct.
|
||||
pub fn (a Any) date() Date {
|
||||
match a {
|
||||
// string { } // TODO
|
||||
time.Time { return a }
|
||||
else { return time }
|
||||
Date { return a }
|
||||
else { return Date{''} }
|
||||
}
|
||||
}
|
||||
|
||||
// date returns `Any` as a time encoded in a `time.Time` struct.
|
||||
pub fn (a Any) time() time.Time {
|
||||
mut time := time.Time{}
|
||||
// time returns `Any` as a `toml.Time` struct.
|
||||
pub fn (a Any) time() Time {
|
||||
match a {
|
||||
// string { } // TODO
|
||||
time.Time { return a }
|
||||
else { return time }
|
||||
Time { return a }
|
||||
else { return Time{''} }
|
||||
}
|
||||
}
|
||||
|
||||
// date returns `Any` as a date+time encoded in a `time.Time` struct.
|
||||
pub fn (a Any) datetime() time.Time {
|
||||
mut time := time.Time{}
|
||||
// datetime returns `Any` as a `toml.DateTime` struct.
|
||||
pub fn (a Any) datetime() DateTime {
|
||||
match a {
|
||||
// string { } // TODO
|
||||
time.Time { return a }
|
||||
else { return time }
|
||||
DateTime { return a }
|
||||
else { return DateTime{''} }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -189,8 +189,16 @@ pub fn (a Any) to_json() string {
|
|||
Null {
|
||||
return 'null'
|
||||
}
|
||||
time.Time {
|
||||
json_text := json2.Any(a.format_ss_micro())
|
||||
DateTime {
|
||||
json_text := json2.Any(a.str())
|
||||
return '"$json_text.json_str()"'
|
||||
}
|
||||
Date {
|
||||
json_text := json2.Any(a.str())
|
||||
return '"$json_text.json_str()"'
|
||||
}
|
||||
Time {
|
||||
json_text := json2.Any(a.str())
|
||||
return '"$json_text.json_str()"'
|
||||
}
|
||||
string {
|
||||
|
|
@ -229,8 +237,14 @@ pub fn (a Any) to_json_any() json2.Any {
|
|||
Null {
|
||||
return json2.Null{}
|
||||
}
|
||||
time.Time {
|
||||
return json2.Any(a.format_ss_micro())
|
||||
DateTime {
|
||||
return json2.Any(a.str())
|
||||
}
|
||||
Date {
|
||||
return json2.Any(a.str())
|
||||
}
|
||||
Time {
|
||||
return json2.Any(a.str())
|
||||
}
|
||||
string {
|
||||
return json2.Any(a.str())
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import toml
|
||||
import time
|
||||
|
||||
fn test_dates() {
|
||||
toml_txt := '
|
||||
|
|
@ -20,54 +19,54 @@ fn test_dates() {
|
|||
toml_doc := toml.parse(toml_txt) or { panic(err) }
|
||||
|
||||
// Re-use vars
|
||||
mut odt_time := time.parse_rfc3339('1979-05-27T07:32:00Z') or { panic(err) }
|
||||
mut odt_time := toml.DateTime{'1979-05-27T07:32:00Z'}
|
||||
mut odt_str := toml_doc.value('odt1').string()
|
||||
|
||||
// odt1 test section
|
||||
assert odt_str == '1979-05-26 07:32:00.000000' // W00t?! why 26th? Z=UTC?
|
||||
assert odt_str == '1979-05-27T07:32:00Z'
|
||||
odt1 := toml_doc.value('odt1')
|
||||
assert odt1.datetime() == odt_time
|
||||
|
||||
// odt2 test section
|
||||
odt_time = time.parse_rfc3339('1979-05-27T00:32:00-07:00') or { panic(err) }
|
||||
odt_time = toml.DateTime{'1979-05-27T00:32:00-07:00'}
|
||||
odt2 := toml_doc.value('odt2')
|
||||
assert odt2.datetime() == odt_time
|
||||
|
||||
// odt3 test section
|
||||
odt_time = time.parse_rfc3339('1979-05-27T00:32:00.999999-07:00') or { panic(err) }
|
||||
odt_time = toml.DateTime{'1979-05-27T00:32:00.999999-07:00'}
|
||||
odt3 := toml_doc.value('odt3')
|
||||
assert odt3.datetime() == odt_time
|
||||
|
||||
// odt4 test section
|
||||
odt_time = time.parse_rfc3339('1979-05-27 07:32:00Z') or { panic(err) }
|
||||
odt_time = toml.DateTime{'1979-05-27 07:32:00Z'}
|
||||
odt4 := toml_doc.value('odt4')
|
||||
assert odt4.datetime() == odt_time
|
||||
|
||||
// ldt1 test section
|
||||
odt_time = time.parse_rfc3339('1979-05-27T07:32:00') or { panic(err) }
|
||||
odt_time = toml.DateTime{'1979-05-27T07:32:00'}
|
||||
ldt1 := toml_doc.value('ldt1')
|
||||
assert ldt1.datetime() == odt_time
|
||||
|
||||
// ldt2 test section
|
||||
odt_time = time.parse_rfc3339('1979-05-27T00:32:00.999999') or { panic(err) }
|
||||
odt_time = toml.DateTime{'1979-05-27T00:32:00.999999'}
|
||||
ldt2 := toml_doc.value('ldt2')
|
||||
assert ldt2.datetime() == odt_time
|
||||
|
||||
// ld1 test section
|
||||
odt_time = time.parse_rfc3339('1979-05-27') or { panic(err) }
|
||||
od_time := toml.Date{'1979-05-27'}
|
||||
ld1 := toml_doc.value('ld1')
|
||||
assert ld1.datetime() == odt_time
|
||||
assert ld1.string() == '1979-05-27 00:00:00.000000'
|
||||
assert ld1.date() == od_time
|
||||
// assert ld1.string() == '1979-05-27' // TODO fail in CI but pass locally?
|
||||
|
||||
// lt1 test section
|
||||
odt_time = time.parse_rfc3339('07:32:00') or { panic(err) }
|
||||
mut ot_time := toml.Time{'07:32:00'}
|
||||
lt1 := toml_doc.value('lt1')
|
||||
assert lt1.datetime() == odt_time
|
||||
assert lt1.string() == '0000-00-00 07:32:00.000000'
|
||||
assert lt1.time() == ot_time
|
||||
// assert lt1.string() == '07:32:00' // TODO fail in CI but pass locally?
|
||||
|
||||
// lt2 test section
|
||||
odt_time = time.parse_rfc3339('00:32:00.999999') or { panic(err) }
|
||||
ot_time = toml.Time{'00:32:00.999999'}
|
||||
lt2 := toml_doc.value('lt2')
|
||||
assert lt2.datetime() == odt_time
|
||||
assert lt2.string() == '0000-00-00 00:32:00.999999'
|
||||
assert lt2.time() == ot_time
|
||||
// assert lt2.string() == '00:32:00.999999' // TODO fail in CI but pass locally?
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,13 +8,39 @@ import toml.util
|
|||
import toml.input
|
||||
import toml.scanner
|
||||
import toml.parser
|
||||
import time
|
||||
import strconv
|
||||
|
||||
// Null is used in sumtype checks as a "default" value when nothing else is possible.
|
||||
pub struct Null {
|
||||
}
|
||||
|
||||
// DateTime is the representation of an RFC 3339 date-only string.
|
||||
pub struct DateTime {
|
||||
datetime string
|
||||
}
|
||||
|
||||
pub fn (dt DateTime) str() string {
|
||||
return dt.datetime
|
||||
}
|
||||
|
||||
// Date is the representation of an RFC 3339 datetime string.
|
||||
pub struct Date {
|
||||
date string
|
||||
}
|
||||
|
||||
pub fn (d Date) str() string {
|
||||
return d.date
|
||||
}
|
||||
|
||||
// Time is the representation of an RFC 3339 time-only string.
|
||||
pub struct Time {
|
||||
time string
|
||||
}
|
||||
|
||||
pub fn (t Time) str() string {
|
||||
return t.time
|
||||
}
|
||||
|
||||
// Config is used to configure the toml parser.
|
||||
// Only one of the fields `text` or `file_path`, is allowed to be set at time of configuration.
|
||||
pub struct Config {
|
||||
|
|
@ -123,46 +149,20 @@ fn (d Doc) value_(values map[string]ast.Value, key []string) Any {
|
|||
return d.ast_to_any(value)
|
||||
}
|
||||
|
||||
// ast_to_any_value converts `from` ast.Value to toml.Any value.
|
||||
// ast_to_any converts `from` ast.Value to toml.Any value.
|
||||
fn (d Doc) ast_to_any(value ast.Value) Any {
|
||||
// `match` isn't currently very suitable for further unwrapping sumtypes in the if's...
|
||||
if value is ast.Date || value is ast.Time || value is ast.DateTime {
|
||||
mut tim := time.Time{}
|
||||
if value is ast.Date {
|
||||
date_str := (value as ast.Date).text
|
||||
|
||||
tim = time.parse_rfc3339(date_str) or {
|
||||
return Any(Null{})
|
||||
// TODO decide this
|
||||
// panic(@MOD + '.' + @STRUCT + '.' + @FN +
|
||||
// ' failed converting "$date_str" to rfc3339: $err')
|
||||
}
|
||||
} else if value is ast.Time {
|
||||
time_str := (value as ast.Time).text
|
||||
|
||||
tim = time.parse_rfc3339(time_str) or {
|
||||
return Any(Null{})
|
||||
// TODO decide this
|
||||
// panic(@MOD + '.' + @STRUCT + '.' + @FN +
|
||||
// ' failed converting "$time_str" to rfc3339: $err')
|
||||
}
|
||||
} else {
|
||||
// value is ast.DateTime
|
||||
datetime_str := (value as ast.DateTime).text
|
||||
|
||||
tim = time.parse_rfc3339(datetime_str) or {
|
||||
return Any(Null{})
|
||||
// TODO decide this
|
||||
// panic(@MOD + '.' + @STRUCT + '.' + @FN +
|
||||
// ' failed converting "$datetime_str" to rfc3339: $err')
|
||||
}
|
||||
}
|
||||
return Any(tim)
|
||||
}
|
||||
|
||||
match value {
|
||||
ast.Date {
|
||||
return Any(Date{value.text})
|
||||
}
|
||||
ast.Time {
|
||||
return Any(Time{value.text})
|
||||
}
|
||||
ast.DateTime {
|
||||
return Any(DateTime{value.text})
|
||||
}
|
||||
ast.Quoted {
|
||||
return Any((value as ast.Quoted).text)
|
||||
return Any(value.text)
|
||||
}
|
||||
ast.Number {
|
||||
if value.text.contains('.') || value.text.to_lower().contains('e') {
|
||||
|
|
|
|||
Loading…
Reference in New Issue