Skip to content

Commit

Permalink
remove toml_default attr, use = instead
Browse files Browse the repository at this point in the history
  • Loading branch information
@kbkpbot
kbkpbot committed Oct 6, 2024
1 parent 373815b commit 4009854
Show file tree
Hide file tree
Showing 3 changed files with 191 additions and 198 deletions.
334 changes: 167 additions & 167 deletions vlib/toml/any.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,186 +330,186 @@ pub fn (a Any) reflect[T]() T {
mut reflected := T{}
$for field in T.fields {
mut toml_field_name := field.name
mut default_value := ''
mut skip := false
// Remapping of field names, for example:
// TOML: 'assert = "ok"'
// V: User { asrt string @[toml: 'assert'] }
// User.asrt == 'ok'
for attr in field.attrs {
if attr == 'skip' {
skip = true
break
}
if attr.starts_with('toml:') {
toml_field_name = attr.all_after(':').trim_space()
}
if attr.starts_with('toml_default:') {
default_value = attr.all_after(':').trim_space()
}
}
value := a.value(toml_field_name)
$if field.typ is string {
reflected.$(field.name) = if value != null { value.string() } else { default_value }
} $else $if field.typ is bool {
reflected.$(field.name) = if value != null { value.bool() } else { default_value.bool() }
} $else $if field.typ is int {
reflected.$(field.name) = if value != null { value.int() } else { default_value.int() }
} $else $if field.typ is f32 {
reflected.$(field.name) = if value != null { value.f32() } else { default_value.f32() }
} $else $if field.typ is f64 {
reflected.$(field.name) = if value != null { value.f64() } else { default_value.f64() }
} $else $if field.typ is i64 {
reflected.$(field.name) = if value != null { value.i64() } else { default_value.i64() }
} $else $if field.typ is u64 {
reflected.$(field.name) = if value != null { value.u64() } else { default_value.u64() }
} $else $if field.typ is Any {
reflected.$(field.name) = value
} $else $if field.typ is DateTime {
reflected.$(field.name) = if value != null {
value.datetime()
} else {
DateTime{default_value}
}
} $else $if field.typ is Date {
reflected.$(field.name) = if value != null { value.date() } else { Date{default_value} }
} $else $if field.typ is Time {
reflected.$(field.name) = if value != null { value.time() } else { Time{default_value} }
}
// Arrays of primitive types
$else $if field.typ is []string {
any_array := value.array()
reflected.$(field.name) = any_array.as_strings()
} $else $if field.typ is []bool {
any_array := value.array()
mut arr := []bool{cap: any_array.len}
for any_value in any_array {
arr << any_value.bool()
}
reflected.$(field.name) = arr
} $else $if field.typ is []int {
any_array := value.array()
mut arr := []int{cap: any_array.len}
for any_value in any_array {
arr << any_value.int()
}
reflected.$(field.name) = arr
} $else $if field.typ is []f32 {
any_array := value.array()
mut arr := []f32{cap: any_array.len}
for any_value in any_array {
arr << any_value.f32()
}
reflected.$(field.name) = arr
} $else $if field.typ is []f64 {
any_array := value.array()
mut arr := []f64{cap: any_array.len}
for any_value in any_array {
arr << any_value.f64()
}
reflected.$(field.name) = arr
} $else $if field.typ is []i64 {
any_array := value.array()
mut arr := []i64{cap: any_array.len}
for any_value in any_array {
arr << any_value.i64()
}
reflected.$(field.name) = arr
} $else $if field.typ is []u64 {
any_array := value.array()
mut arr := []u64{cap: any_array.len}
for any_value in any_array {
arr << any_value.u64()
}
reflected.$(field.name) = arr
} $else $if field.typ is []Any {
reflected.$(field.name) = value.array()
} $else $if field.typ is []DateTime {
any_array := value.array()
mut arr := []DateTime{cap: any_array.len}
for any_value in any_array {
arr << any_value.datetime()
}
reflected.$(field.name) = arr
} $else $if field.typ is []Date {
any_array := value.array()
mut arr := []Date{cap: any_array.len}
for any_value in any_array {
arr << any_value.date()
}
reflected.$(field.name) = arr
} $else $if field.typ is []Time {
any_array := value.array()
mut arr := []Time{cap: any_array.len}
for any_value in any_array {
arr << any_value.time()
}
reflected.$(field.name) = arr
}
// String key maps of primitive types
$else $if field.typ is map[string]string {
any_map := value.as_map()
reflected.$(field.name) = any_map.as_strings()
} $else $if field.typ is map[string]bool {
any_map := value.as_map()
mut type_map := map[string]bool{}
for k, any_value in any_map {
type_map[k] = any_value.bool()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]int {
any_map := value.as_map()
mut type_map := map[string]int{}
for k, any_value in any_map {
type_map[k] = any_value.int()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]f32 {
any_map := value.as_map()
mut type_map := map[string]f32{}
for k, any_value in any_map {
type_map[k] = any_value.f32()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]f64 {
any_map := value.as_map()
mut type_map := map[string]f64{}
for k, any_value in any_map {
type_map[k] = any_value.f64()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]i64 {
any_map := value.as_map()
mut type_map := map[string]i64{}
for k, any_value in any_map {
type_map[k] = any_value.i64()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]u64 {
any_map := value.as_map()
mut type_map := map[string]u64{}
for k, any_value in any_map {
type_map[k] = any_value.u64()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]Any {
reflected.$(field.name) = value.as_map()
} $else $if field.typ is map[string]DateTime {
any_map := value.as_map()
mut type_map := map[string]DateTime{}
for k, any_value in any_map {
type_map[k] = any_value.datetime()
// only set the field's value when value != null and !skip, else field got it's default value
if !skip && value != null {
$if field.typ is string {
reflected.$(field.name) = value.string()
} $else $if field.typ is bool {
reflected.$(field.name) = value.bool()
} $else $if field.typ is int {
reflected.$(field.name) = value.int()
} $else $if field.typ is f32 {
reflected.$(field.name) = value.f32()
} $else $if field.typ is f64 {
reflected.$(field.name) = value.f64()
} $else $if field.typ is i64 {
reflected.$(field.name) = value.i64()
} $else $if field.typ is u64 {
reflected.$(field.name) = value.u64()
} $else $if field.typ is Any {
reflected.$(field.name) = value
} $else $if field.typ is DateTime {
reflected.$(field.name) = value.datetime()
} $else $if field.typ is Date {
reflected.$(field.name) = value.date()
} $else $if field.typ is Time {
reflected.$(field.name) = value.time()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]Date {
any_map := value.as_map()
mut type_map := map[string]Date{}
for k, any_value in any_map {
type_map[k] = any_value.date()
// Arrays of primitive types
$else $if field.typ is []string {
any_array := value.array()
reflected.$(field.name) = any_array.as_strings()
} $else $if field.typ is []bool {
any_array := value.array()
mut arr := []bool{cap: any_array.len}
for any_value in any_array {
arr << any_value.bool()
}
reflected.$(field.name) = arr
} $else $if field.typ is []int {
any_array := value.array()
mut arr := []int{cap: any_array.len}
for any_value in any_array {
arr << any_value.int()
}
reflected.$(field.name) = arr
} $else $if field.typ is []f32 {
any_array := value.array()
mut arr := []f32{cap: any_array.len}
for any_value in any_array {
arr << any_value.f32()
}
reflected.$(field.name) = arr
} $else $if field.typ is []f64 {
any_array := value.array()
mut arr := []f64{cap: any_array.len}
for any_value in any_array {
arr << any_value.f64()
}
reflected.$(field.name) = arr
} $else $if field.typ is []i64 {
any_array := value.array()
mut arr := []i64{cap: any_array.len}
for any_value in any_array {
arr << any_value.i64()
}
reflected.$(field.name) = arr
} $else $if field.typ is []u64 {
any_array := value.array()
mut arr := []u64{cap: any_array.len}
for any_value in any_array {
arr << any_value.u64()
}
reflected.$(field.name) = arr
} $else $if field.typ is []Any {
reflected.$(field.name) = value.array()
} $else $if field.typ is []DateTime {
any_array := value.array()
mut arr := []DateTime{cap: any_array.len}
for any_value in any_array {
arr << any_value.datetime()
}
reflected.$(field.name) = arr
} $else $if field.typ is []Date {
any_array := value.array()
mut arr := []Date{cap: any_array.len}
for any_value in any_array {
arr << any_value.date()
}
reflected.$(field.name) = arr
} $else $if field.typ is []Time {
any_array := value.array()
mut arr := []Time{cap: any_array.len}
for any_value in any_array {
arr << any_value.time()
}
reflected.$(field.name) = arr
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]Time {
any_map := value.as_map()
mut type_map := map[string]Time{}
for k, any_value in any_map {
type_map[k] = any_value.time()
// String key maps of primitive types
$else $if field.typ is map[string]string {
any_map := value.as_map()
reflected.$(field.name) = any_map.as_strings()
} $else $if field.typ is map[string]bool {
any_map := value.as_map()
mut type_map := map[string]bool{}
for k, any_value in any_map {
type_map[k] = any_value.bool()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]int {
any_map := value.as_map()
mut type_map := map[string]int{}
for k, any_value in any_map {
type_map[k] = any_value.int()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]f32 {
any_map := value.as_map()
mut type_map := map[string]f32{}
for k, any_value in any_map {
type_map[k] = any_value.f32()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]f64 {
any_map := value.as_map()
mut type_map := map[string]f64{}
for k, any_value in any_map {
type_map[k] = any_value.f64()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]i64 {
any_map := value.as_map()
mut type_map := map[string]i64{}
for k, any_value in any_map {
type_map[k] = any_value.i64()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]u64 {
any_map := value.as_map()
mut type_map := map[string]u64{}
for k, any_value in any_map {
type_map[k] = any_value.u64()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]Any {
reflected.$(field.name) = value.as_map()
} $else $if field.typ is map[string]DateTime {
any_map := value.as_map()
mut type_map := map[string]DateTime{}
for k, any_value in any_map {
type_map[k] = any_value.datetime()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]Date {
any_map := value.as_map()
mut type_map := map[string]Date{}
for k, any_value in any_map {
type_map[k] = any_value.date()
}
reflected.$(field.name) = type_map.clone()
} $else $if field.typ is map[string]Time {
any_map := value.as_map()
mut type_map := map[string]Time{}
for k, any_value in any_map {
type_map[k] = any_value.time()
}
reflected.$(field.name) = type_map.clone()
}
reflected.$(field.name) = type_map.clone()
}
}
return reflected
Expand Down
20 changes: 10 additions & 10 deletions vlib/toml/tests/default_value_test.v
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ val_time = 22:22:22.222
const toml_all_default_text = '# This TOML can reflect/decode to a struct all with default values'

struct Test {
val_string string @[toml_default: 'abcd']
val_bool bool @[toml_default: true]
val_int int @[toml_default: 123]
val_i64 i64 @[toml_default: 1234]
val_u64 u64 @[toml_default: 12345]
val_f32 f32 @[toml_default: 100.1]
val_f64 f64 @[toml_default: 1000.1]
val_datetime toml.DateTime @[toml_default: '1980-07-11 21:23:42.123']
val_date toml.Date @[toml_default: '1977-07-07']
val_time toml.Time @[toml_default: '11:11:11.111']
val_string string = 'abcd'
val_bool bool = true
val_int int = 123
val_i64 i64 = 1234
val_u64 u64 = 12345
val_f32 f32 = 100.1
val_f64 f64 = 1000.1
val_datetime toml.DateTime = toml.DateTime{'1980-07-11 21:23:42.123'}
val_date toml.Date = toml.Date{'1977-07-07'}
val_time toml.Time = toml.Time{'11:11:11.111'}
}

fn test_reflect_default_values() {
Expand Down
Loading

0 comments on commit 4009854

Please sign in to comment.