diff --git a/toml/_parser.ts b/toml/_parser.ts index e9018f87b4a7..43f4df6fbf1c 100644 --- a/toml/_parser.ts +++ b/toml/_parser.ts @@ -261,32 +261,6 @@ function or[]>( }; } -/** Join the parse results of the given parser into an array. - * - * If the parser fails at the first attempt, it will return an empty array. - */ -function join( - parser: ParserComponent, - separator: string, -): ParserComponent { - const Separator = character(separator); - return (scanner: Scanner): ParseResult => { - const out: T[] = []; - const first = parser(scanner); - if (!first.ok) return success(out); - out.push(first.body); - while (!scanner.eof()) { - if (!Separator(scanner).ok) break; - const result = parser(scanner); - if (!result.ok) { - throw new SyntaxError(`Invalid token after "${separator}"`); - } - out.push(result.body); - } - return success(out); - }; -} - /** Join the parse results of the given parser into an array. * * This requires the parser to succeed at least once. @@ -421,8 +395,9 @@ export function bareKey(scanner: Scanner): ParseResult { function escapeSequence(scanner: Scanner): ParseResult { if (scanner.char() !== "\\") return failure(); scanner.next(); - // See https://toml.io/en/v1.0.0-rc.3#string - switch (scanner.char()) { + // See https://toml.io/en/v1.1.0#string + const char = scanner.char(); + switch (char) { case "b": scanner.next(); return success("\b"); @@ -438,11 +413,15 @@ function escapeSequence(scanner: Scanner): ParseResult { case "r": scanner.next(); return success("\r"); + case "e": + scanner.next(); + return success("\x1B"); + case "x": case "u": case "U": { // Unicode character - const codePointLen = scanner.char() === "u" ? 4 : 6; - const codePoint = parseInt("0x" + scanner.slice(1, 1 + codePointLen), 16); + const codePointLen = { "x": 2, "u": 4, "U": 8 }[char]; + const codePoint = Number("0x" + scanner.slice(1, 1 + codePointLen)); const str = String.fromCodePoint(codePoint); scanner.next(codePointLen + 1); return success(str); @@ -455,7 +434,7 @@ function escapeSequence(scanner: Scanner): ParseResult { return success("\\"); default: throw new SyntaxError( - `Invalid escape sequence: \\${scanner.char()}`, + `Invalid escape sequence: \\${char}`, ); } } @@ -712,14 +691,18 @@ export function dateTime(scanner: Scanner): ParseResult { return success(date); } -const LOCAL_TIME_REGEXP = /(\d{2}):(\d{2}):(\d{2})(?:\.[0-9]+)?\b/y; +const LOCAL_TIME_REGEXP = /(\d{2}):(\d{2})(:(\d{2})(?:\.[0-9]+)?)?\b/y; export function localTime(scanner: Scanner): ParseResult { scanner.skipWhitespaces(); - const match = scanner.match(LOCAL_TIME_REGEXP)?.[0]; - if (!match) return failure(); - scanner.next(match.length); - return success(match); + const string = scanner.match(LOCAL_TIME_REGEXP)?.[0]; + if (!string) return failure(); + scanner.next(string.length); + // seconds are omitted + if (string.length == 5) { + return success(`${string}:00`); + } + return success(string); } export function arrayValue(scanner: Scanner): ParseResult { @@ -750,17 +733,30 @@ export function arrayValue(scanner: Scanner): ParseResult { export function inlineTable( scanner: Scanner, ): ParseResult> { - scanner.nextUntilChar(); - if (scanner.char(1) === "}") { - scanner.next(2); - return success({ __proto__: null }); - } - const pairs = surround("{", join(pair, ","), "}")(scanner); - if (!pairs.ok) return failure(); + scanner.skipWhitespaces(); + + if (scanner.char() !== "{") return failure(); + scanner.next(); + let table = { __proto__: null } as Record; - for (const pair of pairs.body) { - table = deepMerge(table, pair); + while (!scanner.eof()) { + scanner.nextUntilChar(); + const result = pair(scanner); + if (!result.ok) break; + table = deepMerge(table, result.body); + scanner.skipWhitespaces(); + // may have a next item, but trailing comma is allowed in inline tables + if (scanner.char() !== ",") break; + scanner.next(); } + + scanner.nextUntilChar(); + + if (scanner.char() !== "}") { + throw new SyntaxError("Inline Table is not closed"); + } + scanner.next(); + return success(table); } diff --git a/toml/_parser_test.ts b/toml/_parser_test.ts index efa569984e99..8f80b05c8812 100644 --- a/toml/_parser_test.ts +++ b/toml/_parser_test.ts @@ -60,8 +60,8 @@ Deno.test({ fn() { const parse = parserFactory(basicString); assertEquals( - parse('"a\\"\\n\\t\\b\\\\\\u3042\\U01F995"'), - 'a"\n\t\b\\\あ🦕', + parse('"a\\"\\n\\t\\b\\e\\\\\\xAE\\u3042\\U0001F995"'), + 'a"\n\t\b\x1B\\\®あ🦕', ); assertEquals(parse('""'), ""); assertEquals(parse('"a\\n"'), "a\n"); @@ -366,6 +366,10 @@ Deno.test({ name: "parse() handles date and date time", fn() { const parse = parserFactory(dateTime); + assertEquals( + parse("1979-05-27T07:32Z"), + new Date("1979-05-27T07:32:00Z"), + ); assertEquals( parse("1979-05-27T07:32:00Z"), new Date("1979-05-27T07:32:00Z"), @@ -382,11 +386,22 @@ Deno.test({ parse("1979-05-27T00:32:00.999999-07:00"), new Date("1979-05-27T07:32:00.999Z"), ); + assertEquals( + parse("1979-05-27 07:32Z"), + new Date("1979-05-27T07:32:00Z"), + ); assertEquals( parse("1979-05-27 07:32:00Z"), new Date("1979-05-27T07:32:00Z"), ); - assertEquals(parse("1979-05-27T07:32:00"), new Date("1979-05-27T07:32:00")); + assertEquals( + parse("1979-05-27T07:32"), + new Date("1979-05-27T07:32:00"), + ); + assertEquals( + parse("1979-05-27T07:32:00"), + new Date("1979-05-27T07:32:00"), + ); assertEquals( parse("1979-05-27T00:32:00.999999"), new Date("1979-05-27T00:32:00.999999"), @@ -406,6 +421,7 @@ Deno.test({ name: "parse() handles local time", fn() { const parse = parserFactory(localTime); + assertEquals(parse("07:32"), "07:32:00"); assertEquals(parse("07:32:00"), "07:32:00"); assertEquals(parse("07:32:00.999"), "07:32:00.999"); assertThrows(() => parse("")); @@ -419,6 +435,7 @@ Deno.test({ assertEquals(parse("1"), 1); assertEquals(parse("1.2"), 1.2); assertEquals(parse("1979-05-27"), new Date("1979-05-27")); + assertEquals(parse("07:32"), "07:32:00"); assertEquals(parse("07:32:00"), "07:32:00"); assertEquals(parse(`"foo.com"`), "foo.com"); assertEquals(parse(`'foo.com'`), "foo.com"); @@ -480,9 +497,9 @@ Deno.test({ last: "Preston-Werner", }); assertEquals(parse(`{ type.name = "pug" }`), { type: { name: "pug" } }); + assertEquals(parse(`{ x = 1,\n y = 2 }`), { x: 1, y: 2 }); + assertEquals(parse(`{ x = 1, }`), { x: 1 }); assertThrows(() => parse(`{ x = 1`)); - assertThrows(() => parse(`{ x = 1,\n y = 2 }`)); - assertThrows(() => parse(`{ x = 1, }`)); }, }); diff --git a/toml/official_parse_test.ts b/toml/official_parse_test.ts index 04a806ca7d6b..35c583c46bb4 100644 --- a/toml/official_parse_test.ts +++ b/toml/official_parse_test.ts @@ -5,7 +5,7 @@ import { convertTestCase, type TestCase } from "./_test_utils.ts"; import { parse } from "./parse.ts"; const testCases = await Deno.readTextFile( - new URL("./testdata/files-toml-1.0.0", import.meta.url), + new URL("./testdata/files-toml-1.1.0", import.meta.url), ); const ignored = [ diff --git a/toml/parse_test.ts b/toml/parse_test.ts index 9e0ec13cb6a9..e2859c4ea11e 100644 --- a/toml/parse_test.ts +++ b/toml/parse_test.ts @@ -110,7 +110,7 @@ withApostrophe = "What if it's not?" withSemicolon = "const message = 'hello world';" withHexNumberLiteral = "Prevent bug from stripping string here ->0xabcdef" withUnicodeChar1 = "\\u3042" -withUnicodeChar2 = "Deno\\U01F995" +withUnicodeChar2 = "Deno\\U0001F995" `); assertEquals(actual, expected); }, diff --git a/toml/testdata/README.md b/toml/testdata/README.md index f185b1e7836c..b1e314fce2d5 100644 --- a/toml/testdata/README.md +++ b/toml/testdata/README.md @@ -1,10 +1,10 @@ This directory contains the test cases copied from the official [toml-lang/toml-test](https://github.com/toml-lang/toml-test) repository at -[`1d35870ef6783d86366ba55d7df703f3f60b3b55`](https://github.com/toml-lang/toml-test/tree/1d35870ef6783d86366ba55d7df703f3f60b3b55). +[`v2.1.0`](https://github.com/toml-lang/toml-test/tree/v2.1.0). The license of the copied data is as follows. -https://github.com/toml-lang/toml-test/blob/1d35870ef6783d86366ba55d7df703f3f60b3b55/LICENSE +https://github.com/toml-lang/toml-test/blob/v2.1.0/LICENSE ``` The MIT License (MIT) diff --git a/toml/testdata/files-toml-1.0.0 b/toml/testdata/files-toml-1.0.0 index 0add8be33231..b49a7e5eb51b 100644 --- a/toml/testdata/files-toml-1.0.0 +++ b/toml/testdata/files-toml-1.0.0 @@ -1,7 +1,5 @@ invalid/array/double-comma-01.toml invalid/array/double-comma-02.toml -invalid/array/double-comma-1.toml -invalid/array/double-comma-2.toml invalid/array/extend-defined-aot.toml invalid/array/extending-table.toml invalid/array/missing-separator-01.toml @@ -14,26 +12,13 @@ invalid/array/no-close-05.toml invalid/array/no-close-06.toml invalid/array/no-close-07.toml invalid/array/no-close-08.toml -invalid/array/no-close-1.toml -invalid/array/no-close-2.toml -invalid/array/no-close-3.toml -invalid/array/no-close-4.toml -invalid/array/no-close-5.toml -invalid/array/no-close-6.toml -invalid/array/no-close-7.toml -invalid/array/no-close-8.toml invalid/array/no-close-table-01.toml invalid/array/no-close-table-02.toml invalid/array/no-comma-01.toml invalid/array/no-comma-02.toml invalid/array/no-comma-03.toml -invalid/array/no-comma-1.toml -invalid/array/no-comma-2.toml -invalid/array/no-comma-3.toml invalid/array/only-comma-01.toml invalid/array/only-comma-02.toml -invalid/array/only-comma-1.toml -invalid/array/only-comma-2.toml invalid/array/tables-01.toml invalid/array/tables-02.toml invalid/array/text-after-array-entries.toml @@ -64,7 +49,6 @@ invalid/control/comment-ff.toml invalid/control/comment-lf.toml invalid/control/comment-null.toml invalid/control/comment-us.toml -invalid/control/multi-cr.toml invalid/control/multi-del.toml invalid/control/multi-lf.toml invalid/control/multi-null.toml @@ -72,7 +56,6 @@ invalid/control/multi-us.toml invalid/control/only-ff.toml invalid/control/only-null.toml invalid/control/only-vt.toml -invalid/control/rawmulti-cr.toml invalid/control/rawmulti-del.toml invalid/control/rawmulti-lf.toml invalid/control/rawmulti-null.toml @@ -139,39 +122,24 @@ invalid/encoding/utf16-comment.toml invalid/encoding/utf16-key.toml invalid/float/double-dot-01.toml invalid/float/double-dot-02.toml -invalid/float/double-point-1.toml -invalid/float/double-point-2.toml invalid/float/exp-dot-01.toml invalid/float/exp-dot-02.toml invalid/float/exp-dot-03.toml invalid/float/exp-double-e-01.toml invalid/float/exp-double-e-02.toml -invalid/float/exp-double-e-1.toml -invalid/float/exp-double-e-2.toml invalid/float/exp-double-us.toml invalid/float/exp-leading-us.toml -invalid/float/exp-point-1.toml -invalid/float/exp-point-2.toml -invalid/float/exp-point-3.toml invalid/float/exp-trailing-us.toml invalid/float/exp-trailing-us-01.toml invalid/float/exp-trailing-us-02.toml -invalid/float/exp-trailing-us-1.toml -invalid/float/exp-trailing-us-2.toml invalid/float/inf-capital.toml invalid/float/inf-incomplete-01.toml invalid/float/inf-incomplete-02.toml invalid/float/inf-incomplete-03.toml -invalid/float/inf-incomplete-1.toml -invalid/float/inf-incomplete-2.toml -invalid/float/inf-incomplete-3.toml invalid/float/inf_underscore.toml invalid/float/leading-dot.toml invalid/float/leading-dot-neg.toml invalid/float/leading-dot-plus.toml -invalid/float/leading-point.toml -invalid/float/leading-point-neg.toml -invalid/float/leading-point-plus.toml invalid/float/leading-us.toml invalid/float/leading-zero.toml invalid/float/leading-zero-neg.toml @@ -180,28 +148,21 @@ invalid/float/nan-capital.toml invalid/float/nan-incomplete-01.toml invalid/float/nan-incomplete-02.toml invalid/float/nan-incomplete-03.toml -invalid/float/nan-incomplete-1.toml -invalid/float/nan-incomplete-2.toml -invalid/float/nan-incomplete-3.toml invalid/float/nan_underscore.toml +invalid/float/trailing-dot.toml invalid/float/trailing-dot-01.toml invalid/float/trailing-dot-02.toml invalid/float/trailing-dot-min.toml invalid/float/trailing-dot-plus.toml invalid/float/trailing-exp.toml +invalid/float/trailing-exp-dot.toml invalid/float/trailing-exp-minus.toml invalid/float/trailing-exp-plus.toml -invalid/float/trailing-exp-point.toml -invalid/float/trailing-point.toml -invalid/float/trailing-point-min.toml -invalid/float/trailing-point-plus.toml invalid/float/trailing-us.toml invalid/float/trailing-us-exp-01.toml invalid/float/trailing-us-exp-02.toml invalid/float/us-after-dot.toml -invalid/float/us-after-point.toml invalid/float/us-before-dot.toml -invalid/float/us-before-point.toml invalid/inline-table/bad-key-syntax.toml invalid/inline-table/double-comma.toml invalid/inline-table/duplicate-key-01.toml @@ -243,8 +204,6 @@ invalid/integer/invalid-bin.toml invalid/integer/invalid-hex-01.toml invalid/integer/invalid-hex-02.toml invalid/integer/invalid-hex-03.toml -invalid/integer/invalid-hex-1.toml -invalid/integer/invalid-hex-2.toml invalid/integer/invalid-oct.toml invalid/integer/leading-us.toml invalid/integer/leading-us-bin.toml @@ -253,15 +212,9 @@ invalid/integer/leading-us-oct.toml invalid/integer/leading-zero-01.toml invalid/integer/leading-zero-02.toml invalid/integer/leading-zero-03.toml -invalid/integer/leading-zero-1.toml -invalid/integer/leading-zero-2.toml -invalid/integer/leading-zero-3.toml invalid/integer/leading-zero-sign-01.toml invalid/integer/leading-zero-sign-02.toml invalid/integer/leading-zero-sign-03.toml -invalid/integer/leading-zero-sign-1.toml -invalid/integer/leading-zero-sign-2.toml -invalid/integer/leading-zero-sign-3.toml invalid/integer/negative-bin.toml invalid/integer/negative-hex.toml invalid/integer/negative-oct.toml @@ -292,6 +245,8 @@ invalid/key/duplicate-keys-04.toml invalid/key/duplicate-keys-05.toml invalid/key/duplicate-keys-06.toml invalid/key/duplicate-keys-07.toml +invalid/key/duplicate-keys-08.toml +invalid/key/duplicate-keys-09.toml invalid/key/empty.toml invalid/key/end-in-escape.toml invalid/key/escape.toml @@ -390,10 +345,6 @@ invalid/string/bad-hex-esc-02.toml invalid/string/bad-hex-esc-03.toml invalid/string/bad-hex-esc-04.toml invalid/string/bad-hex-esc-05.toml -invalid/string/bad-hex-esc-1.toml -invalid/string/bad-hex-esc-2.toml -invalid/string/bad-hex-esc-3.toml -invalid/string/bad-hex-esc-4.toml invalid/string/bad-multiline.toml invalid/string/bad-slash-escape.toml invalid/string/bad-uni-esc-01.toml @@ -403,20 +354,13 @@ invalid/string/bad-uni-esc-04.toml invalid/string/bad-uni-esc-05.toml invalid/string/bad-uni-esc-06.toml invalid/string/bad-uni-esc-07.toml -invalid/string/bad-uni-esc-1.toml -invalid/string/bad-uni-esc-2.toml -invalid/string/bad-uni-esc-3.toml -invalid/string/bad-uni-esc-4.toml -invalid/string/bad-uni-esc-5.toml -invalid/string/bad-uni-esc-6.toml -invalid/string/bad-uni-esc-7.toml -invalid/string/bad-uni-esc-ml-1.toml -invalid/string/bad-uni-esc-ml-2.toml -invalid/string/bad-uni-esc-ml-3.toml -invalid/string/bad-uni-esc-ml-4.toml -invalid/string/bad-uni-esc-ml-5.toml -invalid/string/bad-uni-esc-ml-6.toml -invalid/string/bad-uni-esc-ml-7.toml +invalid/string/bad-uni-esc-ml-01.toml +invalid/string/bad-uni-esc-ml-02.toml +invalid/string/bad-uni-esc-ml-03.toml +invalid/string/bad-uni-esc-ml-04.toml +invalid/string/bad-uni-esc-ml-05.toml +invalid/string/bad-uni-esc-ml-06.toml +invalid/string/bad-uni-esc-ml-07.toml invalid/string/basic-byte-escapes.toml invalid/string/basic-multiline-out-of-range-unicode-escape-01.toml invalid/string/basic-multiline-out-of-range-unicode-escape-02.toml @@ -555,14 +499,14 @@ valid/array/nospaces.json valid/array/nospaces.toml valid/array/open-parent-table.json valid/array/open-parent-table.toml -valid/array/string-quote-comma.json -valid/array/string-quote-comma.toml -valid/array/string-quote-comma-2.json -valid/array/string-quote-comma-2.toml -valid/array/string-with-comma.json -valid/array/string-with-comma.toml -valid/array/string-with-comma-2.json -valid/array/string-with-comma-2.toml +valid/array/string-quote-comma-01.json +valid/array/string-quote-comma-01.toml +valid/array/string-quote-comma-02.json +valid/array/string-quote-comma-02.toml +valid/array/string-with-comma-01.json +valid/array/string-with-comma-01.toml +valid/array/string-with-comma-02.json +valid/array/string-with-comma-02.toml valid/array/strings.json valid/array/strings.toml valid/array/table-array-string-backslash.json @@ -649,20 +593,20 @@ valid/inline-table/end-in-bool.json valid/inline-table/end-in-bool.toml valid/inline-table/inline-table.json valid/inline-table/inline-table.toml -valid/inline-table/key-dotted-1.json -valid/inline-table/key-dotted-1.toml -valid/inline-table/key-dotted-2.json -valid/inline-table/key-dotted-2.toml -valid/inline-table/key-dotted-3.json -valid/inline-table/key-dotted-3.toml -valid/inline-table/key-dotted-4.json -valid/inline-table/key-dotted-4.toml -valid/inline-table/key-dotted-5.json -valid/inline-table/key-dotted-5.toml -valid/inline-table/key-dotted-6.json -valid/inline-table/key-dotted-6.toml -valid/inline-table/key-dotted-7.json -valid/inline-table/key-dotted-7.toml +valid/inline-table/key-dotted-01.json +valid/inline-table/key-dotted-01.toml +valid/inline-table/key-dotted-02.json +valid/inline-table/key-dotted-02.toml +valid/inline-table/key-dotted-03.json +valid/inline-table/key-dotted-03.toml +valid/inline-table/key-dotted-04.json +valid/inline-table/key-dotted-04.toml +valid/inline-table/key-dotted-05.json +valid/inline-table/key-dotted-05.toml +valid/inline-table/key-dotted-06.json +valid/inline-table/key-dotted-06.toml +valid/inline-table/key-dotted-07.json +valid/inline-table/key-dotted-07.toml valid/inline-table/multiline.json valid/inline-table/multiline.toml valid/inline-table/nest.json @@ -685,22 +629,22 @@ valid/key/alphanum.json valid/key/alphanum.toml valid/key/case-sensitive.json valid/key/case-sensitive.toml -valid/key/dotted-1.json -valid/key/dotted-1.toml -valid/key/dotted-2.json -valid/key/dotted-2.toml -valid/key/dotted-3.json -valid/key/dotted-3.toml -valid/key/dotted-4.json -valid/key/dotted-4.toml +valid/key/dotted-01.json +valid/key/dotted-01.toml +valid/key/dotted-02.json +valid/key/dotted-02.toml +valid/key/dotted-03.json +valid/key/dotted-03.toml +valid/key/dotted-04.json +valid/key/dotted-04.toml valid/key/dotted-empty.json valid/key/dotted-empty.toml -valid/key/empty-1.json -valid/key/empty-1.toml -valid/key/empty-2.json -valid/key/empty-2.toml -valid/key/empty-3.json -valid/key/empty-3.toml +valid/key/empty-01.json +valid/key/empty-01.toml +valid/key/empty-02.json +valid/key/empty-02.toml +valid/key/empty-03.json +valid/key/empty-03.toml valid/key/equals-nospace.json valid/key/equals-nospace.toml valid/key/escapes.json diff --git a/toml/testdata/files-toml-1.1.0 b/toml/testdata/files-toml-1.1.0 index 42060e434906..8b1b2d477af6 100644 --- a/toml/testdata/files-toml-1.1.0 +++ b/toml/testdata/files-toml-1.1.0 @@ -1,7 +1,5 @@ invalid/array/double-comma-01.toml invalid/array/double-comma-02.toml -invalid/array/double-comma-1.toml -invalid/array/double-comma-2.toml invalid/array/extend-defined-aot.toml invalid/array/extending-table.toml invalid/array/missing-separator-01.toml @@ -14,26 +12,13 @@ invalid/array/no-close-05.toml invalid/array/no-close-06.toml invalid/array/no-close-07.toml invalid/array/no-close-08.toml -invalid/array/no-close-1.toml -invalid/array/no-close-2.toml -invalid/array/no-close-3.toml -invalid/array/no-close-4.toml -invalid/array/no-close-5.toml -invalid/array/no-close-6.toml -invalid/array/no-close-7.toml -invalid/array/no-close-8.toml invalid/array/no-close-table-01.toml invalid/array/no-close-table-02.toml invalid/array/no-comma-01.toml invalid/array/no-comma-02.toml invalid/array/no-comma-03.toml -invalid/array/no-comma-1.toml -invalid/array/no-comma-2.toml -invalid/array/no-comma-3.toml invalid/array/only-comma-01.toml invalid/array/only-comma-02.toml -invalid/array/only-comma-1.toml -invalid/array/only-comma-2.toml invalid/array/tables-01.toml invalid/array/tables-02.toml invalid/array/text-after-array-entries.toml @@ -138,39 +123,24 @@ invalid/encoding/utf16-comment.toml invalid/encoding/utf16-key.toml invalid/float/double-dot-01.toml invalid/float/double-dot-02.toml -invalid/float/double-point-1.toml -invalid/float/double-point-2.toml invalid/float/exp-dot-01.toml invalid/float/exp-dot-02.toml invalid/float/exp-dot-03.toml invalid/float/exp-double-e-01.toml invalid/float/exp-double-e-02.toml -invalid/float/exp-double-e-1.toml -invalid/float/exp-double-e-2.toml invalid/float/exp-double-us.toml invalid/float/exp-leading-us.toml -invalid/float/exp-point-1.toml -invalid/float/exp-point-2.toml -invalid/float/exp-point-3.toml invalid/float/exp-trailing-us.toml invalid/float/exp-trailing-us-01.toml invalid/float/exp-trailing-us-02.toml -invalid/float/exp-trailing-us-1.toml -invalid/float/exp-trailing-us-2.toml invalid/float/inf-capital.toml invalid/float/inf-incomplete-01.toml invalid/float/inf-incomplete-02.toml invalid/float/inf-incomplete-03.toml -invalid/float/inf-incomplete-1.toml -invalid/float/inf-incomplete-2.toml -invalid/float/inf-incomplete-3.toml invalid/float/inf_underscore.toml invalid/float/leading-dot.toml invalid/float/leading-dot-neg.toml invalid/float/leading-dot-plus.toml -invalid/float/leading-point.toml -invalid/float/leading-point-neg.toml -invalid/float/leading-point-plus.toml invalid/float/leading-us.toml invalid/float/leading-zero.toml invalid/float/leading-zero-neg.toml @@ -179,28 +149,21 @@ invalid/float/nan-capital.toml invalid/float/nan-incomplete-01.toml invalid/float/nan-incomplete-02.toml invalid/float/nan-incomplete-03.toml -invalid/float/nan-incomplete-1.toml -invalid/float/nan-incomplete-2.toml -invalid/float/nan-incomplete-3.toml invalid/float/nan_underscore.toml +invalid/float/trailing-dot.toml invalid/float/trailing-dot-01.toml invalid/float/trailing-dot-02.toml invalid/float/trailing-dot-min.toml invalid/float/trailing-dot-plus.toml invalid/float/trailing-exp.toml +invalid/float/trailing-exp-dot.toml invalid/float/trailing-exp-minus.toml invalid/float/trailing-exp-plus.toml -invalid/float/trailing-exp-point.toml -invalid/float/trailing-point.toml -invalid/float/trailing-point-min.toml -invalid/float/trailing-point-plus.toml invalid/float/trailing-us.toml invalid/float/trailing-us-exp-01.toml invalid/float/trailing-us-exp-02.toml invalid/float/us-after-dot.toml -invalid/float/us-after-point.toml invalid/float/us-before-dot.toml -invalid/float/us-before-point.toml invalid/inline-table/bad-key-syntax.toml invalid/inline-table/double-comma.toml invalid/inline-table/duplicate-key-01.toml @@ -210,10 +173,6 @@ invalid/inline-table/duplicate-key-04.toml invalid/inline-table/empty-01.toml invalid/inline-table/empty-02.toml invalid/inline-table/empty-03.toml -invalid/inline-table/linebreak-01.toml -invalid/inline-table/linebreak-02.toml -invalid/inline-table/linebreak-03.toml -invalid/inline-table/linebreak-04.toml invalid/inline-table/no-close-01.toml invalid/inline-table/no-close-02.toml invalid/inline-table/no-comma-01.toml @@ -241,8 +200,6 @@ invalid/integer/invalid-bin.toml invalid/integer/invalid-hex-01.toml invalid/integer/invalid-hex-02.toml invalid/integer/invalid-hex-03.toml -invalid/integer/invalid-hex-1.toml -invalid/integer/invalid-hex-2.toml invalid/integer/invalid-oct.toml invalid/integer/leading-us.toml invalid/integer/leading-us-bin.toml @@ -251,15 +208,9 @@ invalid/integer/leading-us-oct.toml invalid/integer/leading-zero-01.toml invalid/integer/leading-zero-02.toml invalid/integer/leading-zero-03.toml -invalid/integer/leading-zero-1.toml -invalid/integer/leading-zero-2.toml -invalid/integer/leading-zero-3.toml invalid/integer/leading-zero-sign-01.toml invalid/integer/leading-zero-sign-02.toml invalid/integer/leading-zero-sign-03.toml -invalid/integer/leading-zero-sign-1.toml -invalid/integer/leading-zero-sign-2.toml -invalid/integer/leading-zero-sign-3.toml invalid/integer/negative-bin.toml invalid/integer/negative-hex.toml invalid/integer/negative-oct.toml @@ -290,6 +241,8 @@ invalid/key/duplicate-keys-04.toml invalid/key/duplicate-keys-05.toml invalid/key/duplicate-keys-06.toml invalid/key/duplicate-keys-07.toml +invalid/key/duplicate-keys-08.toml +invalid/key/duplicate-keys-09.toml invalid/key/empty.toml invalid/key/end-in-escape.toml invalid/key/escape.toml @@ -386,10 +339,6 @@ invalid/string/bad-hex-esc-02.toml invalid/string/bad-hex-esc-03.toml invalid/string/bad-hex-esc-04.toml invalid/string/bad-hex-esc-05.toml -invalid/string/bad-hex-esc-1.toml -invalid/string/bad-hex-esc-2.toml -invalid/string/bad-hex-esc-3.toml -invalid/string/bad-hex-esc-4.toml invalid/string/bad-multiline.toml invalid/string/bad-slash-escape.toml invalid/string/bad-uni-esc-01.toml @@ -399,20 +348,13 @@ invalid/string/bad-uni-esc-04.toml invalid/string/bad-uni-esc-05.toml invalid/string/bad-uni-esc-06.toml invalid/string/bad-uni-esc-07.toml -invalid/string/bad-uni-esc-1.toml -invalid/string/bad-uni-esc-2.toml -invalid/string/bad-uni-esc-3.toml -invalid/string/bad-uni-esc-4.toml -invalid/string/bad-uni-esc-5.toml -invalid/string/bad-uni-esc-6.toml -invalid/string/bad-uni-esc-7.toml -invalid/string/bad-uni-esc-ml-1.toml -invalid/string/bad-uni-esc-ml-2.toml -invalid/string/bad-uni-esc-ml-3.toml -invalid/string/bad-uni-esc-ml-4.toml -invalid/string/bad-uni-esc-ml-5.toml -invalid/string/bad-uni-esc-ml-6.toml -invalid/string/bad-uni-esc-ml-7.toml +invalid/string/bad-uni-esc-ml-01.toml +invalid/string/bad-uni-esc-ml-02.toml +invalid/string/bad-uni-esc-ml-03.toml +invalid/string/bad-uni-esc-ml-04.toml +invalid/string/bad-uni-esc-ml-05.toml +invalid/string/bad-uni-esc-ml-06.toml +invalid/string/bad-uni-esc-ml-07.toml invalid/string/basic-multiline-out-of-range-unicode-escape-01.toml invalid/string/basic-multiline-out-of-range-unicode-escape-02.toml invalid/string/basic-multiline-quotes.toml @@ -550,14 +492,14 @@ valid/array/nospaces.json valid/array/nospaces.toml valid/array/open-parent-table.json valid/array/open-parent-table.toml -valid/array/string-quote-comma.json -valid/array/string-quote-comma.toml -valid/array/string-quote-comma-2.json -valid/array/string-quote-comma-2.toml -valid/array/string-with-comma.json -valid/array/string-with-comma.toml -valid/array/string-with-comma-2.json -valid/array/string-with-comma-2.toml +valid/array/string-quote-comma-01.json +valid/array/string-quote-comma-01.toml +valid/array/string-quote-comma-02.json +valid/array/string-quote-comma-02.toml +valid/array/string-with-comma-01.json +valid/array/string-with-comma-01.toml +valid/array/string-with-comma-02.json +valid/array/string-with-comma-02.toml valid/array/strings.json valid/array/strings.toml valid/array/table-array-string-backslash.json @@ -646,20 +588,20 @@ valid/inline-table/end-in-bool.json valid/inline-table/end-in-bool.toml valid/inline-table/inline-table.json valid/inline-table/inline-table.toml -valid/inline-table/key-dotted-1.json -valid/inline-table/key-dotted-1.toml -valid/inline-table/key-dotted-2.json -valid/inline-table/key-dotted-2.toml -valid/inline-table/key-dotted-3.json -valid/inline-table/key-dotted-3.toml -valid/inline-table/key-dotted-4.json -valid/inline-table/key-dotted-4.toml -valid/inline-table/key-dotted-5.json -valid/inline-table/key-dotted-5.toml -valid/inline-table/key-dotted-6.json -valid/inline-table/key-dotted-6.toml -valid/inline-table/key-dotted-7.json -valid/inline-table/key-dotted-7.toml +valid/inline-table/key-dotted-01.json +valid/inline-table/key-dotted-01.toml +valid/inline-table/key-dotted-02.json +valid/inline-table/key-dotted-02.toml +valid/inline-table/key-dotted-03.json +valid/inline-table/key-dotted-03.toml +valid/inline-table/key-dotted-04.json +valid/inline-table/key-dotted-04.toml +valid/inline-table/key-dotted-05.json +valid/inline-table/key-dotted-05.toml +valid/inline-table/key-dotted-06.json +valid/inline-table/key-dotted-06.toml +valid/inline-table/key-dotted-07.json +valid/inline-table/key-dotted-07.toml valid/inline-table/multiline.json valid/inline-table/multiline.toml valid/inline-table/nest.json @@ -686,22 +628,22 @@ valid/key/alphanum.json valid/key/alphanum.toml valid/key/case-sensitive.json valid/key/case-sensitive.toml -valid/key/dotted-1.json -valid/key/dotted-1.toml -valid/key/dotted-2.json -valid/key/dotted-2.toml -valid/key/dotted-3.json -valid/key/dotted-3.toml -valid/key/dotted-4.json -valid/key/dotted-4.toml +valid/key/dotted-01.json +valid/key/dotted-01.toml +valid/key/dotted-02.json +valid/key/dotted-02.toml +valid/key/dotted-03.json +valid/key/dotted-03.toml +valid/key/dotted-04.json +valid/key/dotted-04.toml valid/key/dotted-empty.json valid/key/dotted-empty.toml -valid/key/empty-1.json -valid/key/empty-1.toml -valid/key/empty-2.json -valid/key/empty-2.toml -valid/key/empty-3.json -valid/key/empty-3.toml +valid/key/empty-01.json +valid/key/empty-01.toml +valid/key/empty-02.json +valid/key/empty-02.toml +valid/key/empty-03.json +valid/key/empty-03.toml valid/key/equals-nospace.json valid/key/equals-nospace.toml valid/key/escapes.json diff --git a/toml/testdata/invalid/array/array.multi b/toml/testdata/invalid/array/array.multi index 1c666912a63e..aad78484c934 100644 --- a/toml/testdata/invalid/array/array.multi +++ b/toml/testdata/invalid/array/array.multi @@ -1,18 +1,18 @@ -double-comma-1 = [1,,2] -double-comma-2 = [1,2,,] +double-comma-01 = [1,,2] +double-comma-02 = [1,2,,] -only-comma-1 = [,] -only-comma-2 = [,,] +only-comma-01 = [,] +only-comma-02 = [,,] -no-comma-1 = [true false] -no-comma-2 = [ 1 2 3 ] -no-comma-3 = [ 1 #,] +no-comma-01 = [true false] +no-comma-02 = [ 1 2 3 ] +no-comma-03 = [ 1 #,] -no-close-1 = [ 1, 2, 3 -no-close-2 = [1, -no-close-3 = [42 #] -no-close-4 = [{ key = 42 -no-close-5 = [{ key = 42} -no-close-6 = [{ key = 42 #}] -no-close-7 = [{ key = 42} #] -no-close-8 = [ +no-close-01 = [ 1, 2, 3 +no-close-02 = [1, +no-close-03 = [42 #] +no-close-04 = [{ key = 42 +no-close-05 = [{ key = 42} +no-close-06 = [{ key = 42 #}] +no-close-07 = [{ key = 42} #] +no-close-08 = [ diff --git a/toml/testdata/invalid/array/double-comma-01.toml b/toml/testdata/invalid/array/double-comma-01.toml index 87602c0491d2..581710a512be 100644 --- a/toml/testdata/invalid/array/double-comma-01.toml +++ b/toml/testdata/invalid/array/double-comma-01.toml @@ -1 +1 @@ -double-comma-1 = [1,,2] +double-comma-01 = [1,,2] diff --git a/toml/testdata/invalid/array/double-comma-02.toml b/toml/testdata/invalid/array/double-comma-02.toml index 8019b50130a5..2fccf269cd88 100644 --- a/toml/testdata/invalid/array/double-comma-02.toml +++ b/toml/testdata/invalid/array/double-comma-02.toml @@ -1 +1 @@ -double-comma-2 = [1,2,,] +double-comma-02 = [1,2,,] diff --git a/toml/testdata/invalid/array/double-comma-1.toml b/toml/testdata/invalid/array/double-comma-1.toml deleted file mode 100644 index 87602c0491d2..000000000000 --- a/toml/testdata/invalid/array/double-comma-1.toml +++ /dev/null @@ -1 +0,0 @@ -double-comma-1 = [1,,2] diff --git a/toml/testdata/invalid/array/double-comma-2.toml b/toml/testdata/invalid/array/double-comma-2.toml deleted file mode 100644 index 8019b50130a5..000000000000 --- a/toml/testdata/invalid/array/double-comma-2.toml +++ /dev/null @@ -1 +0,0 @@ -double-comma-2 = [1,2,,] diff --git a/toml/testdata/invalid/array/no-close-01.toml b/toml/testdata/invalid/array/no-close-01.toml index fa72e49b27ea..151607371298 100644 --- a/toml/testdata/invalid/array/no-close-01.toml +++ b/toml/testdata/invalid/array/no-close-01.toml @@ -1 +1 @@ -no-close-1 = [ 1, 2, 3 +no-close-01 = [ 1, 2, 3 diff --git a/toml/testdata/invalid/array/no-close-02.toml b/toml/testdata/invalid/array/no-close-02.toml index 01874ad4f409..d971094ceacc 100644 --- a/toml/testdata/invalid/array/no-close-02.toml +++ b/toml/testdata/invalid/array/no-close-02.toml @@ -1 +1 @@ -no-close-2 = [1, +no-close-02 = [1, diff --git a/toml/testdata/invalid/array/no-close-03.toml b/toml/testdata/invalid/array/no-close-03.toml index 7edcc4397b24..c1a15db3ae97 100644 --- a/toml/testdata/invalid/array/no-close-03.toml +++ b/toml/testdata/invalid/array/no-close-03.toml @@ -1 +1 @@ -no-close-3 = [42 #] +no-close-03 = [42 #] diff --git a/toml/testdata/invalid/array/no-close-04.toml b/toml/testdata/invalid/array/no-close-04.toml index 8c64b5e22c57..69976c14e2e8 100644 --- a/toml/testdata/invalid/array/no-close-04.toml +++ b/toml/testdata/invalid/array/no-close-04.toml @@ -1 +1 @@ -no-close-4 = [{ key = 42 +no-close-04 = [{ key = 42 diff --git a/toml/testdata/invalid/array/no-close-05.toml b/toml/testdata/invalid/array/no-close-05.toml index fba61097f038..b8cdd01364d4 100644 --- a/toml/testdata/invalid/array/no-close-05.toml +++ b/toml/testdata/invalid/array/no-close-05.toml @@ -1 +1 @@ -no-close-5 = [{ key = 42} +no-close-05 = [{ key = 42} diff --git a/toml/testdata/invalid/array/no-close-06.toml b/toml/testdata/invalid/array/no-close-06.toml index 551e7114fc40..48a4fec41bda 100644 --- a/toml/testdata/invalid/array/no-close-06.toml +++ b/toml/testdata/invalid/array/no-close-06.toml @@ -1 +1 @@ -no-close-6 = [{ key = 42 #}] +no-close-06 = [{ key = 42 #}] diff --git a/toml/testdata/invalid/array/no-close-07.toml b/toml/testdata/invalid/array/no-close-07.toml index fe8c8fdd1a02..e7159e722481 100644 --- a/toml/testdata/invalid/array/no-close-07.toml +++ b/toml/testdata/invalid/array/no-close-07.toml @@ -1 +1 @@ -no-close-7 = [{ key = 42} #] +no-close-07 = [{ key = 42} #] diff --git a/toml/testdata/invalid/array/no-close-08.toml b/toml/testdata/invalid/array/no-close-08.toml index 3378bf3dc7fc..7dcdedeb074f 100644 --- a/toml/testdata/invalid/array/no-close-08.toml +++ b/toml/testdata/invalid/array/no-close-08.toml @@ -1 +1 @@ -no-close-8 = [ +no-close-08 = [ diff --git a/toml/testdata/invalid/array/no-close-1.toml b/toml/testdata/invalid/array/no-close-1.toml deleted file mode 100644 index fa72e49b27ea..000000000000 --- a/toml/testdata/invalid/array/no-close-1.toml +++ /dev/null @@ -1 +0,0 @@ -no-close-1 = [ 1, 2, 3 diff --git a/toml/testdata/invalid/array/no-close-2.toml b/toml/testdata/invalid/array/no-close-2.toml deleted file mode 100644 index 01874ad4f409..000000000000 --- a/toml/testdata/invalid/array/no-close-2.toml +++ /dev/null @@ -1 +0,0 @@ -no-close-2 = [1, diff --git a/toml/testdata/invalid/array/no-close-3.toml b/toml/testdata/invalid/array/no-close-3.toml deleted file mode 100644 index 7edcc4397b24..000000000000 --- a/toml/testdata/invalid/array/no-close-3.toml +++ /dev/null @@ -1 +0,0 @@ -no-close-3 = [42 #] diff --git a/toml/testdata/invalid/array/no-close-4.toml b/toml/testdata/invalid/array/no-close-4.toml deleted file mode 100644 index 8c64b5e22c57..000000000000 --- a/toml/testdata/invalid/array/no-close-4.toml +++ /dev/null @@ -1 +0,0 @@ -no-close-4 = [{ key = 42 diff --git a/toml/testdata/invalid/array/no-close-5.toml b/toml/testdata/invalid/array/no-close-5.toml deleted file mode 100644 index fba61097f038..000000000000 --- a/toml/testdata/invalid/array/no-close-5.toml +++ /dev/null @@ -1 +0,0 @@ -no-close-5 = [{ key = 42} diff --git a/toml/testdata/invalid/array/no-close-6.toml b/toml/testdata/invalid/array/no-close-6.toml deleted file mode 100644 index 551e7114fc40..000000000000 --- a/toml/testdata/invalid/array/no-close-6.toml +++ /dev/null @@ -1 +0,0 @@ -no-close-6 = [{ key = 42 #}] diff --git a/toml/testdata/invalid/array/no-close-7.toml b/toml/testdata/invalid/array/no-close-7.toml deleted file mode 100644 index fe8c8fdd1a02..000000000000 --- a/toml/testdata/invalid/array/no-close-7.toml +++ /dev/null @@ -1 +0,0 @@ -no-close-7 = [{ key = 42} #] diff --git a/toml/testdata/invalid/array/no-close-8.toml b/toml/testdata/invalid/array/no-close-8.toml deleted file mode 100644 index 3378bf3dc7fc..000000000000 --- a/toml/testdata/invalid/array/no-close-8.toml +++ /dev/null @@ -1 +0,0 @@ -no-close-8 = [ diff --git a/toml/testdata/invalid/array/no-comma-01.toml b/toml/testdata/invalid/array/no-comma-01.toml index ae7ab2495d9d..88b69fd318a7 100644 --- a/toml/testdata/invalid/array/no-comma-01.toml +++ b/toml/testdata/invalid/array/no-comma-01.toml @@ -1 +1 @@ -no-comma-1 = [true false] +no-comma-01 = [true false] diff --git a/toml/testdata/invalid/array/no-comma-02.toml b/toml/testdata/invalid/array/no-comma-02.toml index a8bc60710b95..a5e6002745c9 100644 --- a/toml/testdata/invalid/array/no-comma-02.toml +++ b/toml/testdata/invalid/array/no-comma-02.toml @@ -1 +1 @@ -no-comma-2 = [ 1 2 3 ] +no-comma-02 = [ 1 2 3 ] diff --git a/toml/testdata/invalid/array/no-comma-03.toml b/toml/testdata/invalid/array/no-comma-03.toml index 1a636d6d0e3b..51124a5083fe 100644 --- a/toml/testdata/invalid/array/no-comma-03.toml +++ b/toml/testdata/invalid/array/no-comma-03.toml @@ -1 +1 @@ -no-comma-3 = [ 1 #,] +no-comma-03 = [ 1 #,] diff --git a/toml/testdata/invalid/array/no-comma-1.toml b/toml/testdata/invalid/array/no-comma-1.toml deleted file mode 100644 index ae7ab2495d9d..000000000000 --- a/toml/testdata/invalid/array/no-comma-1.toml +++ /dev/null @@ -1 +0,0 @@ -no-comma-1 = [true false] diff --git a/toml/testdata/invalid/array/no-comma-2.toml b/toml/testdata/invalid/array/no-comma-2.toml deleted file mode 100644 index a8bc60710b95..000000000000 --- a/toml/testdata/invalid/array/no-comma-2.toml +++ /dev/null @@ -1 +0,0 @@ -no-comma-2 = [ 1 2 3 ] diff --git a/toml/testdata/invalid/array/no-comma-3.toml b/toml/testdata/invalid/array/no-comma-3.toml deleted file mode 100644 index 1a636d6d0e3b..000000000000 --- a/toml/testdata/invalid/array/no-comma-3.toml +++ /dev/null @@ -1 +0,0 @@ -no-comma-3 = [ 1 #,] diff --git a/toml/testdata/invalid/array/only-comma-01.toml b/toml/testdata/invalid/array/only-comma-01.toml index dca0f1b4b262..2d85110f865d 100644 --- a/toml/testdata/invalid/array/only-comma-01.toml +++ b/toml/testdata/invalid/array/only-comma-01.toml @@ -1 +1 @@ -only-comma-1 = [,] +only-comma-01 = [,] diff --git a/toml/testdata/invalid/array/only-comma-02.toml b/toml/testdata/invalid/array/only-comma-02.toml index 3e46ca62f255..b9f7979b7908 100644 --- a/toml/testdata/invalid/array/only-comma-02.toml +++ b/toml/testdata/invalid/array/only-comma-02.toml @@ -1 +1 @@ -only-comma-2 = [,,] +only-comma-02 = [,,] diff --git a/toml/testdata/invalid/array/only-comma-1.toml b/toml/testdata/invalid/array/only-comma-1.toml deleted file mode 100644 index dca0f1b4b262..000000000000 --- a/toml/testdata/invalid/array/only-comma-1.toml +++ /dev/null @@ -1 +0,0 @@ -only-comma-1 = [,] diff --git a/toml/testdata/invalid/array/only-comma-2.toml b/toml/testdata/invalid/array/only-comma-2.toml deleted file mode 100644 index 3e46ca62f255..000000000000 --- a/toml/testdata/invalid/array/only-comma-2.toml +++ /dev/null @@ -1 +0,0 @@ -only-comma-2 = [,,] diff --git a/toml/testdata/invalid/datetime/offset-overflow-minute.toml b/toml/testdata/invalid/datetime/offset-overflow-minute.toml index fdcadc52532d..7ab68ecfd0c0 100644 --- a/toml/testdata/invalid/datetime/offset-overflow-minute.toml +++ b/toml/testdata/invalid/datetime/offset-overflow-minute.toml @@ -1,3 +1 @@ -# Minute must be 00-59; we allow 60 too because some people do write offsets of -# 60 minutes -d = 1985-06-18 17:04:07+12:61 +d = 1985-06-18 17:04:07+12:60 diff --git a/toml/testdata/invalid/float/double-dot-01.toml b/toml/testdata/invalid/float/double-dot-01.toml index 2105fa9beb2b..637d03266eb1 100644 --- a/toml/testdata/invalid/float/double-dot-01.toml +++ b/toml/testdata/invalid/float/double-dot-01.toml @@ -1 +1 @@ -double-point-1 = 0..1 +double-dot-01 = 0..1 diff --git a/toml/testdata/invalid/float/double-dot-02.toml b/toml/testdata/invalid/float/double-dot-02.toml index 1ef3d0b736b9..9c1b779b300a 100644 --- a/toml/testdata/invalid/float/double-dot-02.toml +++ b/toml/testdata/invalid/float/double-dot-02.toml @@ -1 +1 @@ -double-point-2 = 0.1.2 +double-dot-02 = 0.1.2 diff --git a/toml/testdata/invalid/float/double-point-1.toml b/toml/testdata/invalid/float/double-point-1.toml deleted file mode 100644 index 2105fa9beb2b..000000000000 --- a/toml/testdata/invalid/float/double-point-1.toml +++ /dev/null @@ -1 +0,0 @@ -double-point-1 = 0..1 diff --git a/toml/testdata/invalid/float/double-point-2.toml b/toml/testdata/invalid/float/double-point-2.toml deleted file mode 100644 index 1ef3d0b736b9..000000000000 --- a/toml/testdata/invalid/float/double-point-2.toml +++ /dev/null @@ -1 +0,0 @@ -double-point-2 = 0.1.2 diff --git a/toml/testdata/invalid/float/exp-dot-01.toml b/toml/testdata/invalid/float/exp-dot-01.toml index 569590bb8e25..f094e843f04a 100644 --- a/toml/testdata/invalid/float/exp-dot-01.toml +++ b/toml/testdata/invalid/float/exp-dot-01.toml @@ -1 +1 @@ -exp-point-1 = 1e2.3 +exp-dot-01 = 1e2.3 diff --git a/toml/testdata/invalid/float/exp-dot-02.toml b/toml/testdata/invalid/float/exp-dot-02.toml index 4a5e1d4dda2a..fda50656f5b1 100644 --- a/toml/testdata/invalid/float/exp-dot-02.toml +++ b/toml/testdata/invalid/float/exp-dot-02.toml @@ -1 +1 @@ -exp-point-2 = 1.e2 +exp-dot-02 = 1.e2 diff --git a/toml/testdata/invalid/float/exp-dot-03.toml b/toml/testdata/invalid/float/exp-dot-03.toml index dd53e98a427c..89fca68b0c79 100644 --- a/toml/testdata/invalid/float/exp-dot-03.toml +++ b/toml/testdata/invalid/float/exp-dot-03.toml @@ -1 +1 @@ -exp-point-3 = 3.e+20 +exp-dot-03 = 3.e+20 diff --git a/toml/testdata/invalid/float/exp-double-e-01.toml b/toml/testdata/invalid/float/exp-double-e-01.toml index ee568ce86951..c1e093593977 100644 --- a/toml/testdata/invalid/float/exp-double-e-01.toml +++ b/toml/testdata/invalid/float/exp-double-e-01.toml @@ -1 +1 @@ -exp-double-e-1 = 1ee2 +exp-double-e-01 = 1ee2 diff --git a/toml/testdata/invalid/float/exp-double-e-02.toml b/toml/testdata/invalid/float/exp-double-e-02.toml index 8fb0158548d3..510bad54ffec 100644 --- a/toml/testdata/invalid/float/exp-double-e-02.toml +++ b/toml/testdata/invalid/float/exp-double-e-02.toml @@ -1 +1 @@ -exp-double-e-2 = 1e2e3 +exp-double-e-02 = 1e2e3 diff --git a/toml/testdata/invalid/float/exp-double-e-1.toml b/toml/testdata/invalid/float/exp-double-e-1.toml deleted file mode 100644 index ee568ce86951..000000000000 --- a/toml/testdata/invalid/float/exp-double-e-1.toml +++ /dev/null @@ -1 +0,0 @@ -exp-double-e-1 = 1ee2 diff --git a/toml/testdata/invalid/float/exp-double-e-2.toml b/toml/testdata/invalid/float/exp-double-e-2.toml deleted file mode 100644 index 8fb0158548d3..000000000000 --- a/toml/testdata/invalid/float/exp-double-e-2.toml +++ /dev/null @@ -1 +0,0 @@ -exp-double-e-2 = 1e2e3 diff --git a/toml/testdata/invalid/float/exp-point-1.toml b/toml/testdata/invalid/float/exp-point-1.toml deleted file mode 100644 index 569590bb8e25..000000000000 --- a/toml/testdata/invalid/float/exp-point-1.toml +++ /dev/null @@ -1 +0,0 @@ -exp-point-1 = 1e2.3 diff --git a/toml/testdata/invalid/float/exp-point-2.toml b/toml/testdata/invalid/float/exp-point-2.toml deleted file mode 100644 index 4a5e1d4dda2a..000000000000 --- a/toml/testdata/invalid/float/exp-point-2.toml +++ /dev/null @@ -1 +0,0 @@ -exp-point-2 = 1.e2 diff --git a/toml/testdata/invalid/float/exp-point-3.toml b/toml/testdata/invalid/float/exp-point-3.toml deleted file mode 100644 index dd53e98a427c..000000000000 --- a/toml/testdata/invalid/float/exp-point-3.toml +++ /dev/null @@ -1 +0,0 @@ -exp-point-3 = 3.e+20 diff --git a/toml/testdata/invalid/float/exp-trailing-us-01.toml b/toml/testdata/invalid/float/exp-trailing-us-01.toml index b0fb70e26f7a..23036b876401 100644 --- a/toml/testdata/invalid/float/exp-trailing-us-01.toml +++ b/toml/testdata/invalid/float/exp-trailing-us-01.toml @@ -1 +1 @@ -exp-trailing-us-1 = 1_e2 +exp-trailing-us-01 = 1_e2 diff --git a/toml/testdata/invalid/float/exp-trailing-us-02.toml b/toml/testdata/invalid/float/exp-trailing-us-02.toml index e35f3e3f661e..00d19f3ad2fe 100644 --- a/toml/testdata/invalid/float/exp-trailing-us-02.toml +++ b/toml/testdata/invalid/float/exp-trailing-us-02.toml @@ -1 +1 @@ -exp-trailing-us-2 = 1.2_e2 +exp-trailing-us-02 = 1.2_e2 diff --git a/toml/testdata/invalid/float/exp-trailing-us-1.toml b/toml/testdata/invalid/float/exp-trailing-us-1.toml deleted file mode 100644 index b0fb70e26f7a..000000000000 --- a/toml/testdata/invalid/float/exp-trailing-us-1.toml +++ /dev/null @@ -1 +0,0 @@ -exp-trailing-us-1 = 1_e2 diff --git a/toml/testdata/invalid/float/exp-trailing-us-2.toml b/toml/testdata/invalid/float/exp-trailing-us-2.toml deleted file mode 100644 index e35f3e3f661e..000000000000 --- a/toml/testdata/invalid/float/exp-trailing-us-2.toml +++ /dev/null @@ -1 +0,0 @@ -exp-trailing-us-2 = 1.2_e2 diff --git a/toml/testdata/invalid/float/float.multi b/toml/testdata/invalid/float/float.multi index e39cf4bd1187..adc17efd2cac 100644 --- a/toml/testdata/invalid/float/float.multi +++ b/toml/testdata/invalid/float/float.multi @@ -2,48 +2,48 @@ leading-zero = 03.14 leading-zero-neg = -03.14 leading-zero-plus = +03.14 -leading-point = .12345 -leading-point-neg = -.12345 -leading-point-plus = +.12345 +leading-dot = .12345 +leading-dot-neg = -.12345 +leading-dot-plus = +.12345 -trailing-point = 1. -trailing-point-min = -1. -trailing-point-plus = +1. +trailing-dot = 1. +trailing-dot-min = -1. +trailing-dot-plus = +1. trailing-exp = 0.0E -trailing-exp-point = 0.e +trailing-exp-dot = 0.e trailing-exp-minus = 0.0e- trailing-exp-plus = 0.0e+ trailing-us = 1.2_ leading-us = _1.2 -us-before-point = 1_.2 -us-after-point = 1._2 +us-before-dot = 1_.2 +us-after-dot = 1._2 -double-point-1 = 0..1 -double-point-2 = 0.1.2 +double-dot-01 = 0..1 +double-dot-02 = 0.1.2 -exp-point-1 = 1e2.3 -exp-point-2 = 1.e2 -exp-point-3 = 3.e+20 +exp-dot-01 = 1e2.3 +exp-dot-02 = 1.e2 +exp-dot-03 = 3.e+20 -exp-double-e-1 = 1ee2 -exp-double-e-2 = 1e2e3 +exp-double-e-01 = 1ee2 +exp-double-e-02 = 1e2e3 exp-leading-us = 1e_23 exp-trailing-us = 1e23_ exp-double-us = 1e__23 -exp-trailing-us-1 = 1_e2 -exp-trailing-us-2 = 1.2_e2 +exp-trailing-us-01 = 1_e2 +exp-trailing-us-02 = 1.2_e2 -inf-incomplete-1 = in -inf-incomplete-2 = +in -inf-incomplete-3 = -in +inf-incomplete-01 = in +inf-incomplete-02 = +in +inf-incomplete-03 = -in -nan-incomplete-1 = na -nan-incomplete-2 = +na -nan-incomplete-3 = -na +nan-incomplete-01 = na +nan-incomplete-02 = +na +nan-incomplete-03 = -na nan_underscore = na_n inf_underscore = in_f diff --git a/toml/testdata/invalid/float/inf-incomplete-01.toml b/toml/testdata/invalid/float/inf-incomplete-01.toml index 2c9ef598e6b0..a32d9f641e90 100644 --- a/toml/testdata/invalid/float/inf-incomplete-01.toml +++ b/toml/testdata/invalid/float/inf-incomplete-01.toml @@ -1 +1 @@ -inf-incomplete-1 = in +inf-incomplete-01 = in diff --git a/toml/testdata/invalid/float/inf-incomplete-02.toml b/toml/testdata/invalid/float/inf-incomplete-02.toml index afda7123dc9f..a8159ed1552b 100644 --- a/toml/testdata/invalid/float/inf-incomplete-02.toml +++ b/toml/testdata/invalid/float/inf-incomplete-02.toml @@ -1 +1 @@ -inf-incomplete-2 = +in +inf-incomplete-02 = +in diff --git a/toml/testdata/invalid/float/inf-incomplete-03.toml b/toml/testdata/invalid/float/inf-incomplete-03.toml index bd8273866d97..aab9bf3ae9cd 100644 --- a/toml/testdata/invalid/float/inf-incomplete-03.toml +++ b/toml/testdata/invalid/float/inf-incomplete-03.toml @@ -1 +1 @@ -inf-incomplete-3 = -in +inf-incomplete-03 = -in diff --git a/toml/testdata/invalid/float/inf-incomplete-1.toml b/toml/testdata/invalid/float/inf-incomplete-1.toml deleted file mode 100644 index 2c9ef598e6b0..000000000000 --- a/toml/testdata/invalid/float/inf-incomplete-1.toml +++ /dev/null @@ -1 +0,0 @@ -inf-incomplete-1 = in diff --git a/toml/testdata/invalid/float/inf-incomplete-2.toml b/toml/testdata/invalid/float/inf-incomplete-2.toml deleted file mode 100644 index afda7123dc9f..000000000000 --- a/toml/testdata/invalid/float/inf-incomplete-2.toml +++ /dev/null @@ -1 +0,0 @@ -inf-incomplete-2 = +in diff --git a/toml/testdata/invalid/float/inf-incomplete-3.toml b/toml/testdata/invalid/float/inf-incomplete-3.toml deleted file mode 100644 index bd8273866d97..000000000000 --- a/toml/testdata/invalid/float/inf-incomplete-3.toml +++ /dev/null @@ -1 +0,0 @@ -inf-incomplete-3 = -in diff --git a/toml/testdata/invalid/float/leading-dot-neg.toml b/toml/testdata/invalid/float/leading-dot-neg.toml index 74c526fc2baa..9b4bf4ac3a4a 100644 --- a/toml/testdata/invalid/float/leading-dot-neg.toml +++ b/toml/testdata/invalid/float/leading-dot-neg.toml @@ -1 +1 @@ -leading-point-neg = -.12345 +leading-dot-neg = -.12345 diff --git a/toml/testdata/invalid/float/leading-dot-plus.toml b/toml/testdata/invalid/float/leading-dot-plus.toml index 85e23a28245b..14eaf3385077 100644 --- a/toml/testdata/invalid/float/leading-dot-plus.toml +++ b/toml/testdata/invalid/float/leading-dot-plus.toml @@ -1 +1 @@ -leading-point-plus = +.12345 +leading-dot-plus = +.12345 diff --git a/toml/testdata/invalid/float/leading-dot.toml b/toml/testdata/invalid/float/leading-dot.toml index a3c29b972c10..bdf4d5fb02da 100644 --- a/toml/testdata/invalid/float/leading-dot.toml +++ b/toml/testdata/invalid/float/leading-dot.toml @@ -1 +1 @@ -leading-point = .12345 +leading-dot = .12345 diff --git a/toml/testdata/invalid/float/leading-point-neg.toml b/toml/testdata/invalid/float/leading-point-neg.toml deleted file mode 100644 index 74c526fc2baa..000000000000 --- a/toml/testdata/invalid/float/leading-point-neg.toml +++ /dev/null @@ -1 +0,0 @@ -leading-point-neg = -.12345 diff --git a/toml/testdata/invalid/float/leading-point-plus.toml b/toml/testdata/invalid/float/leading-point-plus.toml deleted file mode 100644 index 85e23a28245b..000000000000 --- a/toml/testdata/invalid/float/leading-point-plus.toml +++ /dev/null @@ -1 +0,0 @@ -leading-point-plus = +.12345 diff --git a/toml/testdata/invalid/float/leading-point.toml b/toml/testdata/invalid/float/leading-point.toml deleted file mode 100644 index a3c29b972c10..000000000000 --- a/toml/testdata/invalid/float/leading-point.toml +++ /dev/null @@ -1 +0,0 @@ -leading-point = .12345 diff --git a/toml/testdata/invalid/float/nan-incomplete-01.toml b/toml/testdata/invalid/float/nan-incomplete-01.toml index df2e26135289..bb10c065966b 100644 --- a/toml/testdata/invalid/float/nan-incomplete-01.toml +++ b/toml/testdata/invalid/float/nan-incomplete-01.toml @@ -1 +1 @@ -nan-incomplete-1 = na +nan-incomplete-01 = na diff --git a/toml/testdata/invalid/float/nan-incomplete-02.toml b/toml/testdata/invalid/float/nan-incomplete-02.toml index 6d2e8fb76232..3a6f5aad696f 100644 --- a/toml/testdata/invalid/float/nan-incomplete-02.toml +++ b/toml/testdata/invalid/float/nan-incomplete-02.toml @@ -1 +1 @@ -nan-incomplete-2 = +na +nan-incomplete-02 = +na diff --git a/toml/testdata/invalid/float/nan-incomplete-03.toml b/toml/testdata/invalid/float/nan-incomplete-03.toml index 9d365acf9ed3..1db2639639b8 100644 --- a/toml/testdata/invalid/float/nan-incomplete-03.toml +++ b/toml/testdata/invalid/float/nan-incomplete-03.toml @@ -1 +1 @@ -nan-incomplete-3 = -na +nan-incomplete-03 = -na diff --git a/toml/testdata/invalid/float/nan-incomplete-1.toml b/toml/testdata/invalid/float/nan-incomplete-1.toml deleted file mode 100644 index df2e26135289..000000000000 --- a/toml/testdata/invalid/float/nan-incomplete-1.toml +++ /dev/null @@ -1 +0,0 @@ -nan-incomplete-1 = na diff --git a/toml/testdata/invalid/float/nan-incomplete-2.toml b/toml/testdata/invalid/float/nan-incomplete-2.toml deleted file mode 100644 index 6d2e8fb76232..000000000000 --- a/toml/testdata/invalid/float/nan-incomplete-2.toml +++ /dev/null @@ -1 +0,0 @@ -nan-incomplete-2 = +na diff --git a/toml/testdata/invalid/float/nan-incomplete-3.toml b/toml/testdata/invalid/float/nan-incomplete-3.toml deleted file mode 100644 index 9d365acf9ed3..000000000000 --- a/toml/testdata/invalid/float/nan-incomplete-3.toml +++ /dev/null @@ -1 +0,0 @@ -nan-incomplete-3 = -na diff --git a/toml/testdata/invalid/float/trailing-dot-min.toml b/toml/testdata/invalid/float/trailing-dot-min.toml index 48741e3b1896..b89fcba3fa21 100644 --- a/toml/testdata/invalid/float/trailing-dot-min.toml +++ b/toml/testdata/invalid/float/trailing-dot-min.toml @@ -1 +1 @@ -trailing-point-min = -1. +trailing-dot-min = -1. diff --git a/toml/testdata/invalid/float/trailing-dot-plus.toml b/toml/testdata/invalid/float/trailing-dot-plus.toml index 99260390f772..c030fab9df66 100644 --- a/toml/testdata/invalid/float/trailing-dot-plus.toml +++ b/toml/testdata/invalid/float/trailing-dot-plus.toml @@ -1 +1 @@ -trailing-point-plus = +1. +trailing-dot-plus = +1. diff --git a/toml/testdata/invalid/float/trailing-dot.toml b/toml/testdata/invalid/float/trailing-dot.toml new file mode 100644 index 000000000000..109f18437379 --- /dev/null +++ b/toml/testdata/invalid/float/trailing-dot.toml @@ -0,0 +1 @@ +trailing-dot = 1. diff --git a/toml/testdata/invalid/float/trailing-exp-dot.toml b/toml/testdata/invalid/float/trailing-exp-dot.toml new file mode 100644 index 000000000000..e556976de8a6 --- /dev/null +++ b/toml/testdata/invalid/float/trailing-exp-dot.toml @@ -0,0 +1 @@ +trailing-exp-dot = 0.e diff --git a/toml/testdata/invalid/float/trailing-exp-point.toml b/toml/testdata/invalid/float/trailing-exp-point.toml deleted file mode 100644 index 71504d4b29eb..000000000000 --- a/toml/testdata/invalid/float/trailing-exp-point.toml +++ /dev/null @@ -1 +0,0 @@ -trailing-exp-point = 0.e diff --git a/toml/testdata/invalid/float/trailing-point-min.toml b/toml/testdata/invalid/float/trailing-point-min.toml deleted file mode 100644 index 48741e3b1896..000000000000 --- a/toml/testdata/invalid/float/trailing-point-min.toml +++ /dev/null @@ -1 +0,0 @@ -trailing-point-min = -1. diff --git a/toml/testdata/invalid/float/trailing-point-plus.toml b/toml/testdata/invalid/float/trailing-point-plus.toml deleted file mode 100644 index 99260390f772..000000000000 --- a/toml/testdata/invalid/float/trailing-point-plus.toml +++ /dev/null @@ -1 +0,0 @@ -trailing-point-plus = +1. diff --git a/toml/testdata/invalid/float/trailing-point.toml b/toml/testdata/invalid/float/trailing-point.toml deleted file mode 100644 index 76c95d916d80..000000000000 --- a/toml/testdata/invalid/float/trailing-point.toml +++ /dev/null @@ -1 +0,0 @@ -trailing-point = 1. diff --git a/toml/testdata/invalid/float/us-after-dot.toml b/toml/testdata/invalid/float/us-after-dot.toml index 7f15f5709112..2fc5b5569634 100644 --- a/toml/testdata/invalid/float/us-after-dot.toml +++ b/toml/testdata/invalid/float/us-after-dot.toml @@ -1 +1 @@ -us-after-point = 1._2 +us-after-dot = 1._2 diff --git a/toml/testdata/invalid/float/us-after-point.toml b/toml/testdata/invalid/float/us-after-point.toml deleted file mode 100644 index 7f15f5709112..000000000000 --- a/toml/testdata/invalid/float/us-after-point.toml +++ /dev/null @@ -1 +0,0 @@ -us-after-point = 1._2 diff --git a/toml/testdata/invalid/float/us-before-dot.toml b/toml/testdata/invalid/float/us-before-dot.toml index c8edcbf0ce42..a35eb3467c4b 100644 --- a/toml/testdata/invalid/float/us-before-dot.toml +++ b/toml/testdata/invalid/float/us-before-dot.toml @@ -1 +1 @@ -us-before-point = 1_.2 +us-before-dot = 1_.2 diff --git a/toml/testdata/invalid/float/us-before-point.toml b/toml/testdata/invalid/float/us-before-point.toml deleted file mode 100644 index c8edcbf0ce42..000000000000 --- a/toml/testdata/invalid/float/us-before-point.toml +++ /dev/null @@ -1 +0,0 @@ -us-before-point = 1_.2 diff --git a/toml/testdata/invalid/integer/integer.multi b/toml/testdata/invalid/integer/integer.multi index cbfaeca8ec4b..d438eff27c02 100644 --- a/toml/testdata/invalid/integer/integer.multi +++ b/toml/testdata/invalid/integer/integer.multi @@ -1,9 +1,9 @@ -leading-zero-1 = 01 -leading-zero-2 = 00 -leading-zero-3 = 0_0 -leading-zero-sign-1 = -01 -leading-zero-sign-2 = +01 -leading-zero-sign-3 = +0_1 +leading-zero-01 = 01 +leading-zero-02 = 00 +leading-zero-03 = 0_0 +leading-zero-sign-01 = -01 +leading-zero-sign-02 = +01 +leading-zero-sign-03 = +0_1 double-sign-plus = ++99 double-sign-nex = --99 @@ -32,8 +32,8 @@ leading-us-hex = _0x1 leading-us-oct = _0o1 leading-us-bin = _0b1 -invalid-hex-1 = 0xaafz -invalid-hex-2 = 0xgabba00f1 +invalid-hex-01 = 0xaafz +invalid-hex-02 = 0xgabba00f1 invalid-oct = 0o778 invalid-bin = 0b0012 diff --git a/toml/testdata/invalid/integer/invalid-hex-01.toml b/toml/testdata/invalid/integer/invalid-hex-01.toml index 9b6c701331ed..fdf40499a8dd 100644 --- a/toml/testdata/invalid/integer/invalid-hex-01.toml +++ b/toml/testdata/invalid/integer/invalid-hex-01.toml @@ -1 +1 @@ -invalid-hex-1 = 0xaafz +invalid-hex-01 = 0xaafz diff --git a/toml/testdata/invalid/integer/invalid-hex-02.toml b/toml/testdata/invalid/integer/invalid-hex-02.toml index f0079aa03f6c..fb3544be99fb 100644 --- a/toml/testdata/invalid/integer/invalid-hex-02.toml +++ b/toml/testdata/invalid/integer/invalid-hex-02.toml @@ -1 +1 @@ -invalid-hex-2 = 0xgabba00f1 +invalid-hex-02 = 0xgabba00f1 diff --git a/toml/testdata/invalid/integer/invalid-hex-1.toml b/toml/testdata/invalid/integer/invalid-hex-1.toml deleted file mode 100644 index 9b6c701331ed..000000000000 --- a/toml/testdata/invalid/integer/invalid-hex-1.toml +++ /dev/null @@ -1 +0,0 @@ -invalid-hex-1 = 0xaafz diff --git a/toml/testdata/invalid/integer/invalid-hex-2.toml b/toml/testdata/invalid/integer/invalid-hex-2.toml deleted file mode 100644 index f0079aa03f6c..000000000000 --- a/toml/testdata/invalid/integer/invalid-hex-2.toml +++ /dev/null @@ -1 +0,0 @@ -invalid-hex-2 = 0xgabba00f1 diff --git a/toml/testdata/invalid/integer/leading-zero-01.toml b/toml/testdata/invalid/integer/leading-zero-01.toml index eba6bda313bf..4256e3612ef9 100644 --- a/toml/testdata/invalid/integer/leading-zero-01.toml +++ b/toml/testdata/invalid/integer/leading-zero-01.toml @@ -1 +1 @@ -leading-zero-1 = 01 +leading-zero-01 = 01 diff --git a/toml/testdata/invalid/integer/leading-zero-02.toml b/toml/testdata/invalid/integer/leading-zero-02.toml index 436af56527d6..7f5db1ad7b67 100644 --- a/toml/testdata/invalid/integer/leading-zero-02.toml +++ b/toml/testdata/invalid/integer/leading-zero-02.toml @@ -1 +1 @@ -leading-zero-2 = 00 +leading-zero-02 = 00 diff --git a/toml/testdata/invalid/integer/leading-zero-03.toml b/toml/testdata/invalid/integer/leading-zero-03.toml index 5404fc8adc5b..92e7f9110a96 100644 --- a/toml/testdata/invalid/integer/leading-zero-03.toml +++ b/toml/testdata/invalid/integer/leading-zero-03.toml @@ -1 +1 @@ -leading-zero-3 = 0_0 +leading-zero-03 = 0_0 diff --git a/toml/testdata/invalid/integer/leading-zero-1.toml b/toml/testdata/invalid/integer/leading-zero-1.toml deleted file mode 100644 index eba6bda313bf..000000000000 --- a/toml/testdata/invalid/integer/leading-zero-1.toml +++ /dev/null @@ -1 +0,0 @@ -leading-zero-1 = 01 diff --git a/toml/testdata/invalid/integer/leading-zero-2.toml b/toml/testdata/invalid/integer/leading-zero-2.toml deleted file mode 100644 index 436af56527d6..000000000000 --- a/toml/testdata/invalid/integer/leading-zero-2.toml +++ /dev/null @@ -1 +0,0 @@ -leading-zero-2 = 00 diff --git a/toml/testdata/invalid/integer/leading-zero-3.toml b/toml/testdata/invalid/integer/leading-zero-3.toml deleted file mode 100644 index 5404fc8adc5b..000000000000 --- a/toml/testdata/invalid/integer/leading-zero-3.toml +++ /dev/null @@ -1 +0,0 @@ -leading-zero-3 = 0_0 diff --git a/toml/testdata/invalid/integer/leading-zero-sign-01.toml b/toml/testdata/invalid/integer/leading-zero-sign-01.toml index 1f15a9da548e..3d044ffe47d6 100644 --- a/toml/testdata/invalid/integer/leading-zero-sign-01.toml +++ b/toml/testdata/invalid/integer/leading-zero-sign-01.toml @@ -1 +1 @@ -leading-zero-sign-1 = -01 +leading-zero-sign-01 = -01 diff --git a/toml/testdata/invalid/integer/leading-zero-sign-02.toml b/toml/testdata/invalid/integer/leading-zero-sign-02.toml index fa259c3cd352..70840c7a5c99 100644 --- a/toml/testdata/invalid/integer/leading-zero-sign-02.toml +++ b/toml/testdata/invalid/integer/leading-zero-sign-02.toml @@ -1 +1 @@ -leading-zero-sign-2 = +01 +leading-zero-sign-02 = +01 diff --git a/toml/testdata/invalid/integer/leading-zero-sign-03.toml b/toml/testdata/invalid/integer/leading-zero-sign-03.toml index 3ac64a5c3bb4..2dbdf4ef9459 100644 --- a/toml/testdata/invalid/integer/leading-zero-sign-03.toml +++ b/toml/testdata/invalid/integer/leading-zero-sign-03.toml @@ -1 +1 @@ -leading-zero-sign-3 = +0_1 +leading-zero-sign-03 = +0_1 diff --git a/toml/testdata/invalid/integer/leading-zero-sign-1.toml b/toml/testdata/invalid/integer/leading-zero-sign-1.toml deleted file mode 100644 index 1f15a9da548e..000000000000 --- a/toml/testdata/invalid/integer/leading-zero-sign-1.toml +++ /dev/null @@ -1 +0,0 @@ -leading-zero-sign-1 = -01 diff --git a/toml/testdata/invalid/integer/leading-zero-sign-2.toml b/toml/testdata/invalid/integer/leading-zero-sign-2.toml deleted file mode 100644 index fa259c3cd352..000000000000 --- a/toml/testdata/invalid/integer/leading-zero-sign-2.toml +++ /dev/null @@ -1 +0,0 @@ -leading-zero-sign-2 = +01 diff --git a/toml/testdata/invalid/integer/leading-zero-sign-3.toml b/toml/testdata/invalid/integer/leading-zero-sign-3.toml deleted file mode 100644 index 3ac64a5c3bb4..000000000000 --- a/toml/testdata/invalid/integer/leading-zero-sign-3.toml +++ /dev/null @@ -1 +0,0 @@ -leading-zero-sign-3 = +0_1 diff --git a/toml/testdata/invalid/key/duplicate-keys-08.toml b/toml/testdata/invalid/key/duplicate-keys-08.toml new file mode 100644 index 000000000000..bd55d6d9e2b4 --- /dev/null +++ b/toml/testdata/invalid/key/duplicate-keys-08.toml @@ -0,0 +1,2 @@ +arr = [1] +arr = [2] diff --git a/toml/testdata/invalid/key/duplicate-keys-09.toml b/toml/testdata/invalid/key/duplicate-keys-09.toml new file mode 100644 index 000000000000..9b786897d0e7 --- /dev/null +++ b/toml/testdata/invalid/key/duplicate-keys-09.toml @@ -0,0 +1,2 @@ +tbl = {k=1} +tbl = {kk=2} diff --git a/toml/testdata/invalid/string/bad-hex-esc-01.toml b/toml/testdata/invalid/string/bad-hex-esc-01.toml index 199c961522ad..0d1e7b8b4601 100644 --- a/toml/testdata/invalid/string/bad-hex-esc-01.toml +++ b/toml/testdata/invalid/string/bad-hex-esc-01.toml @@ -1 +1 @@ -bad-hex-esc-1 = "\x0g" +bad-hex-esc-01 = "\x0g" diff --git a/toml/testdata/invalid/string/bad-hex-esc-02.toml b/toml/testdata/invalid/string/bad-hex-esc-02.toml index 3ff076534822..617a7b705cf9 100644 --- a/toml/testdata/invalid/string/bad-hex-esc-02.toml +++ b/toml/testdata/invalid/string/bad-hex-esc-02.toml @@ -1 +1 @@ -bad-hex-esc-2 = "\xG0" +bad-hex-esc-02 = "\xG0" diff --git a/toml/testdata/invalid/string/bad-hex-esc-03.toml b/toml/testdata/invalid/string/bad-hex-esc-03.toml index 5a1df546c7df..194d9e61880e 100644 --- a/toml/testdata/invalid/string/bad-hex-esc-03.toml +++ b/toml/testdata/invalid/string/bad-hex-esc-03.toml @@ -1 +1 @@ -bad-hex-esc-3 = "\x" +bad-hex-esc-03 = "\x" diff --git a/toml/testdata/invalid/string/bad-hex-esc-04.toml b/toml/testdata/invalid/string/bad-hex-esc-04.toml index 4df871b6a28f..01fc6558d5c7 100644 --- a/toml/testdata/invalid/string/bad-hex-esc-04.toml +++ b/toml/testdata/invalid/string/bad-hex-esc-04.toml @@ -1 +1 @@ -bad-hex-esc-4 = "\x 50" +bad-hex-esc-04 = "\x 50" diff --git a/toml/testdata/invalid/string/bad-hex-esc-1.toml b/toml/testdata/invalid/string/bad-hex-esc-1.toml deleted file mode 100644 index 199c961522ad..000000000000 --- a/toml/testdata/invalid/string/bad-hex-esc-1.toml +++ /dev/null @@ -1 +0,0 @@ -bad-hex-esc-1 = "\x0g" diff --git a/toml/testdata/invalid/string/bad-hex-esc-2.toml b/toml/testdata/invalid/string/bad-hex-esc-2.toml deleted file mode 100644 index 3ff076534822..000000000000 --- a/toml/testdata/invalid/string/bad-hex-esc-2.toml +++ /dev/null @@ -1 +0,0 @@ -bad-hex-esc-2 = "\xG0" diff --git a/toml/testdata/invalid/string/bad-hex-esc-3.toml b/toml/testdata/invalid/string/bad-hex-esc-3.toml deleted file mode 100644 index 5a1df546c7df..000000000000 --- a/toml/testdata/invalid/string/bad-hex-esc-3.toml +++ /dev/null @@ -1 +0,0 @@ -bad-hex-esc-3 = "\x" diff --git a/toml/testdata/invalid/string/bad-hex-esc-4.toml b/toml/testdata/invalid/string/bad-hex-esc-4.toml deleted file mode 100644 index 4df871b6a28f..000000000000 --- a/toml/testdata/invalid/string/bad-hex-esc-4.toml +++ /dev/null @@ -1 +0,0 @@ -bad-hex-esc-4 = "\x 50" diff --git a/toml/testdata/invalid/string/bad-uni-esc-01.toml b/toml/testdata/invalid/string/bad-uni-esc-01.toml index 36de1d1e76f9..4892098fb6ef 100644 --- a/toml/testdata/invalid/string/bad-uni-esc-01.toml +++ b/toml/testdata/invalid/string/bad-uni-esc-01.toml @@ -1 +1 @@ -bad-uni-esc-1 = "val\ue" +bad-uni-esc-01 = "val\ue" diff --git a/toml/testdata/invalid/string/bad-uni-esc-02.toml b/toml/testdata/invalid/string/bad-uni-esc-02.toml index 0c5a6e34a694..cae01c50fb89 100644 --- a/toml/testdata/invalid/string/bad-uni-esc-02.toml +++ b/toml/testdata/invalid/string/bad-uni-esc-02.toml @@ -1 +1 @@ -bad-uni-esc-2 = "val\Ux" +bad-uni-esc-02 = "val\Ux" diff --git a/toml/testdata/invalid/string/bad-uni-esc-03.toml b/toml/testdata/invalid/string/bad-uni-esc-03.toml index 1909da7afff9..6a8feb0f9617 100644 --- a/toml/testdata/invalid/string/bad-uni-esc-03.toml +++ b/toml/testdata/invalid/string/bad-uni-esc-03.toml @@ -1 +1 @@ -bad-uni-esc-3 = "val\U0000000" +bad-uni-esc-03 = "val\U0000000" diff --git a/toml/testdata/invalid/string/bad-uni-esc-04.toml b/toml/testdata/invalid/string/bad-uni-esc-04.toml index 68f0942baefa..3752983d4b54 100644 --- a/toml/testdata/invalid/string/bad-uni-esc-04.toml +++ b/toml/testdata/invalid/string/bad-uni-esc-04.toml @@ -1 +1 @@ -bad-uni-esc-4 = "val\U0000" +bad-uni-esc-04 = "val\U0000" diff --git a/toml/testdata/invalid/string/bad-uni-esc-05.toml b/toml/testdata/invalid/string/bad-uni-esc-05.toml index be5322bad553..90f5755e083b 100644 --- a/toml/testdata/invalid/string/bad-uni-esc-05.toml +++ b/toml/testdata/invalid/string/bad-uni-esc-05.toml @@ -1 +1 @@ -bad-uni-esc-5 = "val\Ugggggggg" +bad-uni-esc-05 = "val\Ugggggggg" diff --git a/toml/testdata/invalid/string/bad-uni-esc-06.toml b/toml/testdata/invalid/string/bad-uni-esc-06.toml index aa67c4b8c081..304b89aa4ece 100644 --- a/toml/testdata/invalid/string/bad-uni-esc-06.toml +++ b/toml/testdata/invalid/string/bad-uni-esc-06.toml @@ -1 +1 @@ -bad-uni-esc-6 = "This string contains a non scalar unicode codepoint \uD801" +bad-uni-esc-06 = "This string contains a non scalar unicode codepoint \uD801" diff --git a/toml/testdata/invalid/string/bad-uni-esc-07.toml b/toml/testdata/invalid/string/bad-uni-esc-07.toml index bda89b376b46..072812a75ef7 100644 --- a/toml/testdata/invalid/string/bad-uni-esc-07.toml +++ b/toml/testdata/invalid/string/bad-uni-esc-07.toml @@ -1 +1 @@ -bad-uni-esc-7 = "\uabag" +bad-uni-esc-07 = "\uabag" diff --git a/toml/testdata/invalid/string/bad-uni-esc-1.toml b/toml/testdata/invalid/string/bad-uni-esc-1.toml deleted file mode 100644 index 36de1d1e76f9..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-1.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-1 = "val\ue" diff --git a/toml/testdata/invalid/string/bad-uni-esc-2.toml b/toml/testdata/invalid/string/bad-uni-esc-2.toml deleted file mode 100644 index 0c5a6e34a694..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-2.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-2 = "val\Ux" diff --git a/toml/testdata/invalid/string/bad-uni-esc-3.toml b/toml/testdata/invalid/string/bad-uni-esc-3.toml deleted file mode 100644 index 1909da7afff9..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-3.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-3 = "val\U0000000" diff --git a/toml/testdata/invalid/string/bad-uni-esc-4.toml b/toml/testdata/invalid/string/bad-uni-esc-4.toml deleted file mode 100644 index 68f0942baefa..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-4.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-4 = "val\U0000" diff --git a/toml/testdata/invalid/string/bad-uni-esc-5.toml b/toml/testdata/invalid/string/bad-uni-esc-5.toml deleted file mode 100644 index be5322bad553..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-5.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-5 = "val\Ugggggggg" diff --git a/toml/testdata/invalid/string/bad-uni-esc-6.toml b/toml/testdata/invalid/string/bad-uni-esc-6.toml deleted file mode 100644 index aa67c4b8c081..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-6.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-6 = "This string contains a non scalar unicode codepoint \uD801" diff --git a/toml/testdata/invalid/string/bad-uni-esc-7.toml b/toml/testdata/invalid/string/bad-uni-esc-7.toml deleted file mode 100644 index bda89b376b46..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-7.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-7 = "\uabag" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-01.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-01.toml new file mode 100644 index 000000000000..23fc99986edd --- /dev/null +++ b/toml/testdata/invalid/string/bad-uni-esc-ml-01.toml @@ -0,0 +1 @@ +bad-uni-esc-ml-01 = """val\ue""" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-02.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-02.toml new file mode 100644 index 000000000000..5e0cc064dbc0 --- /dev/null +++ b/toml/testdata/invalid/string/bad-uni-esc-ml-02.toml @@ -0,0 +1 @@ +bad-uni-esc-ml-02 = """val\Ux""" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-03.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-03.toml new file mode 100644 index 000000000000..62bc2f7bf120 --- /dev/null +++ b/toml/testdata/invalid/string/bad-uni-esc-ml-03.toml @@ -0,0 +1 @@ +bad-uni-esc-ml-03 = """val\U0000000""" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-04.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-04.toml new file mode 100644 index 000000000000..1c2ee7619f8d --- /dev/null +++ b/toml/testdata/invalid/string/bad-uni-esc-ml-04.toml @@ -0,0 +1 @@ +bad-uni-esc-ml-04 = """val\U0000""" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-05.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-05.toml new file mode 100644 index 000000000000..76222c46d9c9 --- /dev/null +++ b/toml/testdata/invalid/string/bad-uni-esc-ml-05.toml @@ -0,0 +1 @@ +bad-uni-esc-ml-05 = """val\Ugggggggg""" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-06.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-06.toml new file mode 100644 index 000000000000..798a26d6fa31 --- /dev/null +++ b/toml/testdata/invalid/string/bad-uni-esc-ml-06.toml @@ -0,0 +1 @@ +bad-uni-esc-ml-06 = """This string contains a non scalar unicode codepoint \uD801""" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-07.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-07.toml new file mode 100644 index 000000000000..12a84c7f728d --- /dev/null +++ b/toml/testdata/invalid/string/bad-uni-esc-ml-07.toml @@ -0,0 +1 @@ +bad-uni-esc-ml-07 = """\uabag""" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-1.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-1.toml deleted file mode 100644 index 84ebd9bf2e56..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-ml-1.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-ml-1 = """val\ue""" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-2.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-2.toml deleted file mode 100644 index 99a1ccfbdfd6..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-ml-2.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-ml-2 = """val\Ux""" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-3.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-3.toml deleted file mode 100644 index 46abbdb4ea21..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-ml-3.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-ml-3 = """val\U0000000""" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-4.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-4.toml deleted file mode 100644 index 26affcf83615..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-ml-4.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-ml-4 = """val\U0000""" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-5.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-5.toml deleted file mode 100644 index 2bbee29cd42a..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-ml-5.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-ml-5 = """val\Ugggggggg""" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-6.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-6.toml deleted file mode 100644 index c8f9bd0210ab..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-ml-6.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-ml-6 = """This string contains a non scalar unicode codepoint \uD801""" diff --git a/toml/testdata/invalid/string/bad-uni-esc-ml-7.toml b/toml/testdata/invalid/string/bad-uni-esc-ml-7.toml deleted file mode 100644 index 2e06ca2f0781..000000000000 --- a/toml/testdata/invalid/string/bad-uni-esc-ml-7.toml +++ /dev/null @@ -1 +0,0 @@ -bad-uni-esc-ml-7 = """\uabag""" diff --git a/toml/testdata/invalid/string/string.multi b/toml/testdata/invalid/string/string.multi index 5cf7f9865e05..a7d14a6e44c4 100644 --- a/toml/testdata/invalid/string/string.multi +++ b/toml/testdata/invalid/string/string.multi @@ -1,20 +1,20 @@ -bad-hex-esc-1 = "\x0g" -bad-hex-esc-2 = "\xG0" -bad-hex-esc-3 = "\x" -bad-hex-esc-4 = "\x 50" +bad-hex-esc-01 = "\x0g" +bad-hex-esc-02 = "\xG0" +bad-hex-esc-03 = "\x" +bad-hex-esc-04 = "\x 50" -bad-uni-esc-1 = "val\ue" -bad-uni-esc-2 = "val\Ux" -bad-uni-esc-3 = "val\U0000000" -bad-uni-esc-4 = "val\U0000" -bad-uni-esc-5 = "val\Ugggggggg" -bad-uni-esc-6 = "This string contains a non scalar unicode codepoint \uD801" -bad-uni-esc-7 = "\uabag" +bad-uni-esc-01 = "val\ue" +bad-uni-esc-02 = "val\Ux" +bad-uni-esc-03 = "val\U0000000" +bad-uni-esc-04 = "val\U0000" +bad-uni-esc-05 = "val\Ugggggggg" +bad-uni-esc-06 = "This string contains a non scalar unicode codepoint \uD801" +bad-uni-esc-07 = "\uabag" -bad-uni-esc-ml-1 = """val\ue""" -bad-uni-esc-ml-2 = """val\Ux""" -bad-uni-esc-ml-3 = """val\U0000000""" -bad-uni-esc-ml-4 = """val\U0000""" -bad-uni-esc-ml-5 = """val\Ugggggggg""" -bad-uni-esc-ml-6 = """This string contains a non scalar unicode codepoint \uD801""" -bad-uni-esc-ml-7 = """\uabag""" +bad-uni-esc-ml-01 = """val\ue""" +bad-uni-esc-ml-02 = """val\Ux""" +bad-uni-esc-ml-03 = """val\U0000000""" +bad-uni-esc-ml-04 = """val\U0000""" +bad-uni-esc-ml-05 = """val\Ugggggggg""" +bad-uni-esc-ml-06 = """This string contains a non scalar unicode codepoint \uD801""" +bad-uni-esc-ml-07 = """\uabag""" diff --git a/toml/testdata/valid/array/string-quote-comma.json b/toml/testdata/valid/array/string-quote-comma-01.json similarity index 100% rename from toml/testdata/valid/array/string-quote-comma.json rename to toml/testdata/valid/array/string-quote-comma-01.json diff --git a/toml/testdata/valid/array/string-quote-comma.toml b/toml/testdata/valid/array/string-quote-comma-01.toml similarity index 100% rename from toml/testdata/valid/array/string-quote-comma.toml rename to toml/testdata/valid/array/string-quote-comma-01.toml diff --git a/toml/testdata/valid/array/string-quote-comma-2.json b/toml/testdata/valid/array/string-quote-comma-02.json similarity index 100% rename from toml/testdata/valid/array/string-quote-comma-2.json rename to toml/testdata/valid/array/string-quote-comma-02.json diff --git a/toml/testdata/valid/array/string-quote-comma-2.toml b/toml/testdata/valid/array/string-quote-comma-02.toml similarity index 100% rename from toml/testdata/valid/array/string-quote-comma-2.toml rename to toml/testdata/valid/array/string-quote-comma-02.toml diff --git a/toml/testdata/valid/array/string-with-comma.json b/toml/testdata/valid/array/string-with-comma-01.json similarity index 100% rename from toml/testdata/valid/array/string-with-comma.json rename to toml/testdata/valid/array/string-with-comma-01.json diff --git a/toml/testdata/valid/array/string-with-comma.toml b/toml/testdata/valid/array/string-with-comma-01.toml similarity index 100% rename from toml/testdata/valid/array/string-with-comma.toml rename to toml/testdata/valid/array/string-with-comma-01.toml diff --git a/toml/testdata/valid/array/string-with-comma-2.json b/toml/testdata/valid/array/string-with-comma-02.json similarity index 100% rename from toml/testdata/valid/array/string-with-comma-2.json rename to toml/testdata/valid/array/string-with-comma-02.json diff --git a/toml/testdata/valid/array/string-with-comma-2.toml b/toml/testdata/valid/array/string-with-comma-02.toml similarity index 100% rename from toml/testdata/valid/array/string-with-comma-2.toml rename to toml/testdata/valid/array/string-with-comma-02.toml diff --git a/toml/testdata/valid/inline-table/key-dotted-1.json b/toml/testdata/valid/inline-table/key-dotted-01.json similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-1.json rename to toml/testdata/valid/inline-table/key-dotted-01.json diff --git a/toml/testdata/valid/inline-table/key-dotted-1.toml b/toml/testdata/valid/inline-table/key-dotted-01.toml similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-1.toml rename to toml/testdata/valid/inline-table/key-dotted-01.toml diff --git a/toml/testdata/valid/inline-table/key-dotted-2.json b/toml/testdata/valid/inline-table/key-dotted-02.json similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-2.json rename to toml/testdata/valid/inline-table/key-dotted-02.json diff --git a/toml/testdata/valid/inline-table/key-dotted-2.toml b/toml/testdata/valid/inline-table/key-dotted-02.toml similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-2.toml rename to toml/testdata/valid/inline-table/key-dotted-02.toml diff --git a/toml/testdata/valid/inline-table/key-dotted-3.json b/toml/testdata/valid/inline-table/key-dotted-03.json similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-3.json rename to toml/testdata/valid/inline-table/key-dotted-03.json diff --git a/toml/testdata/valid/inline-table/key-dotted-3.toml b/toml/testdata/valid/inline-table/key-dotted-03.toml similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-3.toml rename to toml/testdata/valid/inline-table/key-dotted-03.toml diff --git a/toml/testdata/valid/inline-table/key-dotted-4.json b/toml/testdata/valid/inline-table/key-dotted-04.json similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-4.json rename to toml/testdata/valid/inline-table/key-dotted-04.json diff --git a/toml/testdata/valid/inline-table/key-dotted-4.toml b/toml/testdata/valid/inline-table/key-dotted-04.toml similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-4.toml rename to toml/testdata/valid/inline-table/key-dotted-04.toml diff --git a/toml/testdata/valid/inline-table/key-dotted-5.json b/toml/testdata/valid/inline-table/key-dotted-05.json similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-5.json rename to toml/testdata/valid/inline-table/key-dotted-05.json diff --git a/toml/testdata/valid/inline-table/key-dotted-5.toml b/toml/testdata/valid/inline-table/key-dotted-05.toml similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-5.toml rename to toml/testdata/valid/inline-table/key-dotted-05.toml diff --git a/toml/testdata/valid/inline-table/key-dotted-6.json b/toml/testdata/valid/inline-table/key-dotted-06.json similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-6.json rename to toml/testdata/valid/inline-table/key-dotted-06.json diff --git a/toml/testdata/valid/inline-table/key-dotted-6.toml b/toml/testdata/valid/inline-table/key-dotted-06.toml similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-6.toml rename to toml/testdata/valid/inline-table/key-dotted-06.toml diff --git a/toml/testdata/valid/inline-table/key-dotted-7.json b/toml/testdata/valid/inline-table/key-dotted-07.json similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-7.json rename to toml/testdata/valid/inline-table/key-dotted-07.json diff --git a/toml/testdata/valid/inline-table/key-dotted-7.toml b/toml/testdata/valid/inline-table/key-dotted-07.toml similarity index 100% rename from toml/testdata/valid/inline-table/key-dotted-7.toml rename to toml/testdata/valid/inline-table/key-dotted-07.toml diff --git a/toml/testdata/valid/key/dotted-1.json b/toml/testdata/valid/key/dotted-01.json similarity index 100% rename from toml/testdata/valid/key/dotted-1.json rename to toml/testdata/valid/key/dotted-01.json diff --git a/toml/testdata/valid/key/dotted-1.toml b/toml/testdata/valid/key/dotted-01.toml similarity index 100% rename from toml/testdata/valid/key/dotted-1.toml rename to toml/testdata/valid/key/dotted-01.toml diff --git a/toml/testdata/valid/key/dotted-2.json b/toml/testdata/valid/key/dotted-02.json similarity index 100% rename from toml/testdata/valid/key/dotted-2.json rename to toml/testdata/valid/key/dotted-02.json diff --git a/toml/testdata/valid/key/dotted-2.toml b/toml/testdata/valid/key/dotted-02.toml similarity index 100% rename from toml/testdata/valid/key/dotted-2.toml rename to toml/testdata/valid/key/dotted-02.toml diff --git a/toml/testdata/valid/key/dotted-3.json b/toml/testdata/valid/key/dotted-03.json similarity index 100% rename from toml/testdata/valid/key/dotted-3.json rename to toml/testdata/valid/key/dotted-03.json diff --git a/toml/testdata/valid/key/dotted-3.toml b/toml/testdata/valid/key/dotted-03.toml similarity index 100% rename from toml/testdata/valid/key/dotted-3.toml rename to toml/testdata/valid/key/dotted-03.toml diff --git a/toml/testdata/valid/key/dotted-4.json b/toml/testdata/valid/key/dotted-04.json similarity index 100% rename from toml/testdata/valid/key/dotted-4.json rename to toml/testdata/valid/key/dotted-04.json diff --git a/toml/testdata/valid/key/dotted-4.toml b/toml/testdata/valid/key/dotted-04.toml similarity index 100% rename from toml/testdata/valid/key/dotted-4.toml rename to toml/testdata/valid/key/dotted-04.toml diff --git a/toml/testdata/valid/key/empty-1.json b/toml/testdata/valid/key/empty-01.json similarity index 100% rename from toml/testdata/valid/key/empty-1.json rename to toml/testdata/valid/key/empty-01.json diff --git a/toml/testdata/valid/key/empty-1.toml b/toml/testdata/valid/key/empty-01.toml similarity index 100% rename from toml/testdata/valid/key/empty-1.toml rename to toml/testdata/valid/key/empty-01.toml diff --git a/toml/testdata/valid/key/empty-2.json b/toml/testdata/valid/key/empty-02.json similarity index 100% rename from toml/testdata/valid/key/empty-2.json rename to toml/testdata/valid/key/empty-02.json diff --git a/toml/testdata/valid/key/empty-2.toml b/toml/testdata/valid/key/empty-02.toml similarity index 100% rename from toml/testdata/valid/key/empty-2.toml rename to toml/testdata/valid/key/empty-02.toml diff --git a/toml/testdata/valid/key/empty-3.json b/toml/testdata/valid/key/empty-03.json similarity index 100% rename from toml/testdata/valid/key/empty-3.json rename to toml/testdata/valid/key/empty-03.json diff --git a/toml/testdata/valid/key/empty-3.toml b/toml/testdata/valid/key/empty-03.toml similarity index 100% rename from toml/testdata/valid/key/empty-3.toml rename to toml/testdata/valid/key/empty-03.toml diff --git a/toml/testdata/valid/spec-1.0.0/string-6.json b/toml/testdata/valid/spec-1.0.0/string-6.json index be206e9b1f74..526d1e176585 100644 --- a/toml/testdata/valid/spec-1.0.0/string-6.json +++ b/toml/testdata/valid/spec-1.0.0/string-6.json @@ -1,7 +1,4 @@ { - "regex2": {"type": "string", "value": "I [dw]on't need \\d{2} apples"}, - "lines": { - "type": "string", - "value": "The first newline is\ntrimmed in raw strings.\n All other whitespace\n is preserved.\n" - } + "lines": {"type": "string", "value": "The first newline is\ntrimmed in raw strings.\n All other whitespace\n is preserved.\n"}, + "regex2": {"type": "string", "value": "I [dw]on't need \\d{2} apples"} } diff --git a/toml/testdata/valid/spec-1.1.0/common-18.json b/toml/testdata/valid/spec-1.1.0/common-18.json index ff2b76b0e0a6..4c46e9b1aa45 100644 --- a/toml/testdata/valid/spec-1.1.0/common-18.json +++ b/toml/testdata/valid/spec-1.1.0/common-18.json @@ -1,7 +1,4 @@ { - "regex2": {"type": "string", "value": "I [dw]on't need \\d{2} apples"}, - "lines": { - "type": "string", - "value": "The first newline is\ntrimmed in literal strings.\n All other whitespace\n is preserved.\n" - } + "lines": {"type": "string", "value": "The first newline is\ntrimmed in literal strings.\n All other whitespace\n is preserved.\n"}, + "regex2": {"type": "string", "value": "I [dw]on't need \\d{2} apples"} }