mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

toml: clean up autocast in parser.v (#17662)

Browse Source
This commit is contained in:
yuyi 2023-03-19 04:15:00 +08:00 committed by GitHub
parent 2df23a6698
commit 14148f3e52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vlib/toml/parser/parser.v
View File

@ -372,7 +372,7 @@ pub fn (mut p Parser) find_in_table(mut table map[string]ast.Value, key DottedKe
if val := t[k] { if val := t[k] {
util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'found key "${k}" in ${t.keys()}') util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'found key "${k}" in ${t.keys()}')
if val is map[string]ast.Value { if val is map[string]ast.Value {
t = &(val as map[string]ast.Value) t = &val
} else { } else {
return error(@MOD + '.' + @STRUCT + '.' + @FN + return error(@MOD + '.' + @STRUCT + '.' + @FN +
' "${k}" in "${key}" is not a map but `${val.type_name()}`') ' "${k}" in "${key}" is not a map but `${val.type_name()}`')
@ -403,8 +403,7 @@ pub fn (mut p Parser) find_array_of_tables() ![]ast.Value {
if val := t[key.str()] { if val := t[key.str()] {
util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'found key "${key}" in ${t.keys()}') util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'found key "${key}" in ${t.keys()}')
if val is []ast.Value { if val is []ast.Value {
arr := (val as []ast.Value) return val
return arr
} }
} }
} }
@ -420,7 +419,7 @@ pub fn (mut p Parser) allocate_in_table(mut table map[string]ast.Value, key Dott
if val := t[k] { if val := t[k] {
util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'found key "${k}" in ${t.keys()}') util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'found key "${k}" in ${t.keys()}')
if val is map[string]ast.Value { if val is map[string]ast.Value {
t = &(val as map[string]ast.Value) t = &val
} else { } else {
return error(@MOD + '.' + @STRUCT + '.' + @FN + return error(@MOD + '.' + @STRUCT + '.' + @FN +
' "${k}" in "${key}" is not a map (${val.type_name()})') ' "${k}" in "${key}" is not a map (${val.type_name()})')
@ -962,7 +961,7 @@ pub fn (mut p Parser) double_array_of_tables(mut table map[string]ast.Value) ! {
if val := t[last.str()] { if val := t[last.str()] {
if val is []ast.Value { if val is []ast.Value {
arr := &(val as []ast.Value) mut arr := &val
arr << p.double_array_of_tables_contents(dotted_key)! arr << p.double_array_of_tables_contents(dotted_key)!
t[last.str()] = arr t[last.str()] = arr
} else { } else {
@ -1326,13 +1325,13 @@ pub fn (mut p Parser) number_or_date() !ast.Value {
date_time_type := p.date_time()! date_time_type := p.date_time()!
match date_time_type { match date_time_type {
ast.Date { ast.Date {
return ast.Value(date_time_type as ast.Date) return ast.Value(date_time_type)
} }
ast.Time { ast.Time {
return ast.Value(date_time_type as ast.Time) return ast.Value(date_time_type)
} }
ast.DateTime { ast.DateTime {
return ast.Value(date_time_type as ast.DateTime) return ast.Value(date_time_type)
} }
} }
} }