Skip to content

toml, tests: support v2.0.0 of the test-suite at toml-lang/toml-test@229ce2e #26101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spytheman merged 1 commit into from
Dec 24, 2025
Merged

toml, tests: support v2.0.0 of the test-suite at toml-lang/toml-test@229ce2e #26101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/download_full_toml_test_suites.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ rm -rf vlib/toml/tests/testdata/iarna vlib/toml/tests/testdata/toml_rs vlib/toml
git -C vlib/toml/tests/testdata/iarna checkout 1880b1a

./v retry -- git clone -n https://github.com/toml-lang/toml-test.git vlib/toml/tests/testdata/toml_lang
git -C vlib/toml/tests/testdata/toml_lang checkout 8bb8d9c
git -C vlib/toml/tests/testdata/toml_lang checkout 229ce2e

# A few history notes of toml-rs (previously alexcrichton):
# commit 7f5472c the test-suite dir moves to the crates/ sub-directory
Expand Down
7 changes: 6 additions & 1 deletion vlib/toml/parser/parser.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,7 @@ pub fn (mut p Parser) time() !ast.Time {
lit += p.tok.lit
p.check(.number)!
lit += p.tok.lit
// TODO: does TOML even have optional seconds?
// NOTE: TOML v1.1.0 have optional seconds
// if p.peek_tok.kind == .colon {
p.check(.colon)!
lit += p.tok.lit
Expand All @@ -1557,6 +1557,11 @@ pub fn (mut p Parser) time() !ast.Time {
p.expect(.number)!
}

if !lit[lit.len - 1].is_digit() {
return error(@MOD + '.' + @STRUCT + '.' + @FN +
' expected a number as last occurrence in "${lit}" got "${lit[lit.len - 1].ascii_str()}"')
}

// Parse offset
if p.peek_tok.kind == .minus || p.peek_tok.kind == .plus {
p.next()!
Expand Down
23 changes: 15 additions & 8 deletions vlib/toml/tests/toml_lang_test.v
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Instructions for developers:
// The actual tests and data can be obtained by doing:
// `git clone -n https://github.com/toml-lang/toml-test.git vlib/toml/tests/testdata/toml_lang`
// `git -C vlib/toml/tests/testdata/toml_lang reset --hard 8bb8d9c
// `git -C vlib/toml/tests/testdata/toml_lang reset --hard 229ce2e
// See also the CI toml tests
import os
import toml
Expand All @@ -14,7 +14,8 @@ const test_files_file = os.join_path(test_root, 'files-toml-1.0.0')
const hide_oks = os.getenv('VTEST_HIDE_OK') == '1'
const no_jq = os.getenv('VNO_JQ') == '1'

// Kept for easier handling of future updates to the tests
// Kept for easier lookup and handling of future updates to the tests.
// NOTE: entries in this list are valid TOML that the parser should work with, but currently does not.
const valid_exceptions = [
'do_not_remove',
'array/open-parent-table.toml',
Expand All @@ -26,19 +27,25 @@ const valid_exceptions = [
'table/array-implicit-and-explicit-after.toml',
'table/array-within-dotted.toml',
]
const jq_not_equal = [
'do_not_remove',
]
// 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-2.toml',
'string/multiline-escape-space-2.toml',
'key/duplicate-keys-06.toml',
'inline-table/duplicate-key-02.toml',
'string/multiline-escape-space-02.toml',
'string/missing-quotes-array.toml',
'table/duplicate-key-dotted-array.toml',
'table/redefine-2.toml',
'table/append-with-dotted-keys-05.toml',
'table/duplicate-key-03.toml',
'table/duplicate-key-10.toml',
'table/redefine-02.toml',
]
const valid_value_exceptions = [
'do_not_remove',
]
const jq_not_equal = [
'do_not_remove',
]

const jq = os.find_abs_path_of_executable('jq') or { '' }
const compare_work_dir_root = os.join_path(os.vtmp_dir(), 'toml_toml_lang')
Expand Down
Loading