toml: fix invalid exception by erroring on duplicate keys in inline table (#26177)

larpon · web-flow · commit cd035e2d9356 · 2025-12-28T11:04:38.000+02:00
diff --git a/vlib/toml/parser/parser.v b/vlib/toml/parser/parser.v
@@ -818,19 +818,24 @@ pub fn (mut p Parser) inline_table(mut tbl map[string]ast.Value) ! {
 							p.check_immutable(left_most)!
 						}
 					}
+					key_str := key.str()
+					util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'inserting @6 "${key_str}" = ${val} into ${ptr_str(t)}')
 					unsafe {
-						util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'inserting @6 "${key}" = ${val} into ${ptr_str(t)}')
-						t[key.str()] = val
+						if _ := t[key_str] {
+							return error(@MOD + '.' + @STRUCT + '.' + @FN +
+								' key "${key_str}" is already initialized with a value. At "${p.tok.kind}" "${p.tok.lit}" in this (excerpt): "...${p.excerpt()}..."')
+						}
+						t[key_str] = val
 					}
 				} else {
 					p.ignore_while(space_formatting)
 					key, val := p.key_value()!
 					key_str := key.str()
+					util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'inserting @5 "${key_str}" = ${val} into ${ptr_str(tbl)}')
 					if _ := tbl[key_str] {
 						return error(@MOD + '.' + @STRUCT + '.' + @FN +
 							' key "${key_str}" is already initialized with a value. At "${p.tok.kind}" "${p.tok.lit}" in this (excerpt): "...${p.excerpt()}..."')
 					}
-					util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'inserting @5 "${key_str}" = ${val} into ${ptr_str(tbl)}')
 					tbl[key_str] = val
 				}
 				previous_token_was_value = true
diff --git a/vlib/toml/tests/toml_lang_test.v b/vlib/toml/tests/toml_lang_test.v
@@ -24,7 +24,6 @@ const valid_exceptions = [
 // NOTE: entries in this list are tests of invalid TOML that should have the parser fail, but currently does not.
 const invalid_exceptions = [
 	'do_not_remove',
-	'inline-table/duplicate-key-02.toml',
 	'string/multiline-escape-space-02.toml',
 	'string/missing-quotes-array.toml',
 	'table/append-with-dotted-keys-05.toml',

Original file line number	Diff line number	Diff line change
`@@ -818,19 +818,24 @@ pub fn (mut p Parser) inline_table(mut tbl map[string]ast.Value) ! {`
`818`	`818`	`p.check_immutable(left_most)!`
`819`	`819`	`}`
`820`	`820`	`}`
	`821`	`+ key_str := key.str()`
	`822`	`+ util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'inserting @6 "${key_str}" = ${val} into ${ptr_str(t)}')`
`821`	`823`	`unsafe {`
`822`		`- util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'inserting @6 "${key}" = ${val} into ${ptr_str(t)}')`
`823`		`- t[key.str()] = val`
	`824`	`+ if _ := t[key_str] {`
	`825`	`+ return error(@MOD + '.' + @STRUCT + '.' + @FN +`
	`826`	`+ ' key "${key_str}" is already initialized with a value. At "${p.tok.kind}" "${p.tok.lit}" in this (excerpt): "...${p.excerpt()}..."')`
	`827`	`+ }`
	`828`	`+ t[key_str] = val`
`824`	`829`	`}`
`825`	`830`	`} else {`
`826`	`831`	`p.ignore_while(space_formatting)`
`827`	`832`	`key, val := p.key_value()!`
`828`	`833`	`key_str := key.str()`
	`834`	`+ util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'inserting @5 "${key_str}" = ${val} into ${ptr_str(tbl)}')`
`829`	`835`	`if _ := tbl[key_str] {`
`830`	`836`	`return error(@MOD + '.' + @STRUCT + '.' + @FN +`
`831`	`837`	`' key "${key_str}" is already initialized with a value. At "${p.tok.kind}" "${p.tok.lit}" in this (excerpt): "...${p.excerpt()}..."')`
`832`	`838`	`}`
`833`		`- util.printdbg(@MOD + '.' + @STRUCT + '.' + @FN, 'inserting @5 "${key_str}" = ${val} into ${ptr_str(tbl)}')`
`834`	`839`	`tbl[key_str] = val`
`835`	`840`	`}`
`836`	`841`	`previous_token_was_value = true`