From 35f00c9f9101806368e3fcd441be4316a896f834 Mon Sep 17 00:00:00 2001
From: Larpon <Larpon@users.noreply.github.com>
Date: Thu, 11 Nov 2021 13:55:51 +0100
Subject: [PATCH] toml: check for text after comma in arrays (#12435)

---
 vlib/toml/parser/parser.v                   | 14 ++++++--------
 vlib/toml/tests/burntsushi.toml-test_test.v |  1 -
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/vlib/toml/parser/parser.v b/vlib/toml/parser/parser.v
index 1971688959..6ff8d5b90d 100644
--- a/vlib/toml/parser/parser.v
+++ b/vlib/toml/parser/parser.v
@@ -462,12 +462,7 @@ pub fn (mut p Parser) inline_table(mut tbl map[string]ast.Value) ? {
 			}
 			.comma {
 				p.ignore_while_peek(parser.space_formatting)
-				if p.peek_tok.kind == .rcbr {
-					p.next() ? // Forward to the peek_tok
-					return error(@MOD + '.' + @STRUCT + '.' + @FN +
-						' unexpected "$p.tok.kind" "$p.tok.lit" at this (excerpt): "...${p.excerpt()}..."')
-				}
-				if p.peek_tok.kind == .comma {
+				if p.peek_tok.kind in [.comma, .rcbr] {
 					p.next() ? // Forward to the peek_tok
 					return error(@MOD + '.' + @STRUCT + '.' + @FN +
 						' unexpected "$p.tok.kind" "$p.tok.lit" at this (excerpt): "...${p.excerpt()}..."')
@@ -693,9 +688,12 @@ pub fn (mut p Parser) array() ?[]ast.Value {
 				previous_token_was_value = true
 			}
 			.comma {
+				p.ignore_while_peek(parser.space_formatting)
 				// Trailing commas before array close is allowed
-				// so we skip `if p.peek_tok.kind == .rsbr { ... }`
-				if p.peek_tok.kind == .comma {
+				// so we do not do `if p.peek_tok.kind == .rsbr { ... }`
+
+				// Check for known errors:
+				if p.peek_tok.kind in [.comma, .bare] {
 					p.next() ? // Forward to the peek_tok
 					return error(@MOD + '.' + @STRUCT + '.' + @FN +
 						' unexpected "$p.tok.kind" "$p.tok.lit" at this (excerpt): "...${p.excerpt()}..."')
diff --git a/vlib/toml/tests/burntsushi.toml-test_test.v b/vlib/toml/tests/burntsushi.toml-test_test.v
index a93945b142..e4657097ed 100644
--- a/vlib/toml/tests/burntsushi.toml-test_test.v
+++ b/vlib/toml/tests/burntsushi.toml-test_test.v
@@ -23,7 +23,6 @@ const (
 		'inline-table/duplicate-key.toml',
 		// Array
 		'array/tables-1.toml',
-		'array/text-after-array-entries.toml',
 	]
 )