From c299e750ad124b0d1d9700d1fedb4e1a27f5336d Mon Sep 17 00:00:00 2001 From: Martin Tournoij Date: Tue, 2 Jan 2024 03:09:15 +0000 Subject: [PATCH] Update toml-test This adds a failing test case for #403. --- .../inline-table/{overwrite-1.toml => overwrite-01.toml} | 0 .../inline-table/{overwrite-2.toml => overwrite-02.toml} | 0 .../inline-table/{overwrite-3.toml => overwrite-03.toml} | 0 .../inline-table/{overwrite-4.toml => overwrite-04.toml} | 0 .../inline-table/{overwrite-5.toml => overwrite-05.toml} | 0 .../inline-table/{overwrite-6.toml => overwrite-06.toml} | 0 .../inline-table/{overwrite-7.toml => overwrite-07.toml} | 0 .../inline-table/{overwrite-8.toml => overwrite-08.toml} | 0 .../inline-table/{overwrite-9.toml => overwrite-09.toml} | 0 .../tests/invalid/inline-table/overwrite-10.toml | 4 ++++ internal/toml-test/tests/valid/spec/float-2.json | 4 ++-- toml_test.go | 9 ++++++--- 12 files changed, 12 insertions(+), 5 deletions(-) rename internal/toml-test/tests/invalid/inline-table/{overwrite-1.toml => overwrite-01.toml} (100%) rename internal/toml-test/tests/invalid/inline-table/{overwrite-2.toml => overwrite-02.toml} (100%) rename internal/toml-test/tests/invalid/inline-table/{overwrite-3.toml => overwrite-03.toml} (100%) rename internal/toml-test/tests/invalid/inline-table/{overwrite-4.toml => overwrite-04.toml} (100%) rename internal/toml-test/tests/invalid/inline-table/{overwrite-5.toml => overwrite-05.toml} (100%) rename internal/toml-test/tests/invalid/inline-table/{overwrite-6.toml => overwrite-06.toml} (100%) rename internal/toml-test/tests/invalid/inline-table/{overwrite-7.toml => overwrite-07.toml} (100%) rename internal/toml-test/tests/invalid/inline-table/{overwrite-8.toml => overwrite-08.toml} (100%) rename internal/toml-test/tests/invalid/inline-table/{overwrite-9.toml => overwrite-09.toml} (100%) create mode 100644 internal/toml-test/tests/invalid/inline-table/overwrite-10.toml diff --git a/internal/toml-test/tests/invalid/inline-table/overwrite-1.toml b/internal/toml-test/tests/invalid/inline-table/overwrite-01.toml similarity index 100% rename from internal/toml-test/tests/invalid/inline-table/overwrite-1.toml rename to internal/toml-test/tests/invalid/inline-table/overwrite-01.toml diff --git a/internal/toml-test/tests/invalid/inline-table/overwrite-2.toml b/internal/toml-test/tests/invalid/inline-table/overwrite-02.toml similarity index 100% rename from internal/toml-test/tests/invalid/inline-table/overwrite-2.toml rename to internal/toml-test/tests/invalid/inline-table/overwrite-02.toml diff --git a/internal/toml-test/tests/invalid/inline-table/overwrite-3.toml b/internal/toml-test/tests/invalid/inline-table/overwrite-03.toml similarity index 100% rename from internal/toml-test/tests/invalid/inline-table/overwrite-3.toml rename to internal/toml-test/tests/invalid/inline-table/overwrite-03.toml diff --git a/internal/toml-test/tests/invalid/inline-table/overwrite-4.toml b/internal/toml-test/tests/invalid/inline-table/overwrite-04.toml similarity index 100% rename from internal/toml-test/tests/invalid/inline-table/overwrite-4.toml rename to internal/toml-test/tests/invalid/inline-table/overwrite-04.toml diff --git a/internal/toml-test/tests/invalid/inline-table/overwrite-5.toml b/internal/toml-test/tests/invalid/inline-table/overwrite-05.toml similarity index 100% rename from internal/toml-test/tests/invalid/inline-table/overwrite-5.toml rename to internal/toml-test/tests/invalid/inline-table/overwrite-05.toml diff --git a/internal/toml-test/tests/invalid/inline-table/overwrite-6.toml b/internal/toml-test/tests/invalid/inline-table/overwrite-06.toml similarity index 100% rename from internal/toml-test/tests/invalid/inline-table/overwrite-6.toml rename to internal/toml-test/tests/invalid/inline-table/overwrite-06.toml diff --git a/internal/toml-test/tests/invalid/inline-table/overwrite-7.toml b/internal/toml-test/tests/invalid/inline-table/overwrite-07.toml similarity index 100% rename from internal/toml-test/tests/invalid/inline-table/overwrite-7.toml rename to internal/toml-test/tests/invalid/inline-table/overwrite-07.toml diff --git a/internal/toml-test/tests/invalid/inline-table/overwrite-8.toml b/internal/toml-test/tests/invalid/inline-table/overwrite-08.toml similarity index 100% rename from internal/toml-test/tests/invalid/inline-table/overwrite-8.toml rename to internal/toml-test/tests/invalid/inline-table/overwrite-08.toml diff --git a/internal/toml-test/tests/invalid/inline-table/overwrite-9.toml b/internal/toml-test/tests/invalid/inline-table/overwrite-09.toml similarity index 100% rename from internal/toml-test/tests/invalid/inline-table/overwrite-9.toml rename to internal/toml-test/tests/invalid/inline-table/overwrite-09.toml diff --git a/internal/toml-test/tests/invalid/inline-table/overwrite-10.toml b/internal/toml-test/tests/invalid/inline-table/overwrite-10.toml new file mode 100644 index 00000000..da5d1b11 --- /dev/null +++ b/internal/toml-test/tests/invalid/inline-table/overwrite-10.toml @@ -0,0 +1,4 @@ +# Set implicit "b", overwrite "b" (illegal!) and then set another implicit. +# +# Caused panic: https://github.com/BurntSushi/toml/issues/403 +a = {b.a = 1, b = 2, b.c = 3} diff --git a/internal/toml-test/tests/valid/spec/float-2.json b/internal/toml-test/tests/valid/spec/float-2.json index 67e5521d..ee8dff35 100644 --- a/internal/toml-test/tests/valid/spec/float-2.json +++ b/internal/toml-test/tests/valid/spec/float-2.json @@ -1,11 +1,11 @@ { "sf1": { "type": "float", - "value": "+inf" + "value": "inf" }, "sf2": { "type": "float", - "value": "+inf" + "value": "inf" }, "sf3": { "type": "float", diff --git a/toml_test.go b/toml_test.go index b460564a..761d1b31 100644 --- a/toml_test.go +++ b/toml_test.go @@ -313,6 +313,9 @@ func runTomlTest(t *testing.T, includeNext bool, wantFail ...string) { Parser: parser{}, RunTests: runTests, SkipTests: []string{ + // TODO: https://github.com/BurntSushi/toml/issues/403 + "invalid/inline-table/overwrite-10", + // These tests are fine, just doesn't deal well with empty output. "valid/comment/noeol", "valid/comment/nonascii", @@ -320,9 +323,9 @@ func runTomlTest(t *testing.T, includeNext bool, wantFail ...string) { // TODO: fix this; we allow appending to tables, but shouldn't. "invalid/array/extend-defined-aot", "invalid/inline-table/duplicate-key-3", - "invalid/inline-table/overwrite-2", - "invalid/inline-table/overwrite-7", - "invalid/inline-table/overwrite-8", + "invalid/inline-table/overwrite-02", + "invalid/inline-table/overwrite-07", + "invalid/inline-table/overwrite-08", "invalid/spec/inline-table-2-0", "invalid/spec/table-9-1", "invalid/table/append-to-array-with-dotted-keys",