diff --git a/vlib/encoding/csv/reader_test.v b/vlib/encoding/csv/reader_test.v index 279ec7c0d2..11549f429e 100644 --- a/vlib/encoding/csv/reader_test.v +++ b/vlib/encoding/csv/reader_test.v @@ -281,28 +281,27 @@ fn test_field_double_quotes() { } struct Test { +mut: id int bonus string amount int + yes bool } fn test_decode_to_struct() { - text := 'id,bonus,amount\r\n1,bomb,1\r\n2,rocket,1\r\n3,lightning,2\r\n' + text := 'id,bonus,amount,yes\r\n1,bomb,1,true\r\n2,rocket,1,false,\r\n3,lightning,2,2\r\n' arr := csv.decode(text) - for i, val in arr { - if i == 0 { - assert val.id == 1 - assert val.bonus == 'bomb' - assert val.amount == 1 - } else if i == 1 { - assert val.id == 2 - assert val.bonus == 'rocket' - assert val.amount == 1 - } else if i == 2 { - assert val.id == 3 - assert val.bonus == 'lightning' - assert val.amount == 2 - } - } + assert arr[0].id == 1 + assert arr[0].bonus == 'bomb' + assert arr[0].amount == 1 + assert arr[0].yes == true + assert arr[1].id == 2 + assert arr[1].bonus == 'rocket' + assert arr[1].amount == 1 + assert arr[1].yes == false + assert arr[2].id == 3 + assert arr[2].bonus == 'lightning' + assert arr[2].amount == 2 + assert arr[2].yes == true assert arr.len == 3 } diff --git a/vlib/encoding/csv/to_struct_arr.v b/vlib/encoding/csv/to_struct_arr.v index 3b260bcc04..2b3cf35444 100644 --- a/vlib/encoding/csv/to_struct_arr.v +++ b/vlib/encoding/csv/to_struct_arr.v @@ -46,11 +46,12 @@ pub fn decode(data string) []T { fn string_to_bool(val string) bool { l_val := val.to_lower().trim_space() - i_val := val.int() if l_val == 'true' { return true } - if i_val == 1 { + + i_val := val.int() + if i_val != 0 { return true }