From 16edbf7be64559e0eb30d8335c7d33cc14a20f5e Mon Sep 17 00:00:00 2001 From: Kenta Kubo <601636+kkebo@users.noreply.github.com> Date: Sat, 6 Sep 2025 22:38:02 +0900 Subject: [PATCH 1/2] Update swiftlang/swift-syntax:main --- Resources/parsers/trunk/Package.resolved | 4 ++-- Resources/parsers/trunk/Package.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/parsers/trunk/Package.resolved b/Resources/parsers/trunk/Package.resolved index f07b4d59..a648709a 100644 --- a/Resources/parsers/trunk/Package.resolved +++ b/Resources/parsers/trunk/Package.resolved @@ -3,10 +3,10 @@ { "identity" : "swift-syntax", "kind" : "remoteSourceControl", - "location" : "https://github.com/apple/swift-syntax", + "location" : "https://github.com/swiftlang/swift-syntax", "state" : { "branch" : "main", - "revision" : "5c57421ff74c63616f8aba0be09f02029fcbffad" + "revision" : "6df106db45da4536a3c9f8cd2a21918999127924" } } ], diff --git a/Resources/parsers/trunk/Package.swift b/Resources/parsers/trunk/Package.swift index 0bd5f6e5..92059a60 100644 --- a/Resources/parsers/trunk/Package.swift +++ b/Resources/parsers/trunk/Package.swift @@ -7,7 +7,7 @@ let package = Package( .macOS(.v13) ], dependencies: [ - .package(url: "https://github.com/apple/swift-syntax", branch: "main"), + .package(url: "https://github.com/swiftlang/swift-syntax", branch: "main"), ], targets: [ .executableTarget( From 96d5866e29f19b6622832b7bd4448fe2064cc693 Mon Sep 17 00:00:00 2001 From: Kenta Kubo <601636+kkebo@users.noreply.github.com> Date: Wed, 10 Sep 2025 06:26:02 +0900 Subject: [PATCH 2/2] Fix tests in Resources/parsers/trunk --- .../trunk/Tests/Tests/Fixtures/test-1-2.json | 70 ++- .../trunk/Tests/Tests/Fixtures/test-1-3.json | 420 ++++++++++++++++-- .../trunk/Tests/Tests/Fixtures/test-1-4.json | 28 +- .../trunk/Tests/Tests/Fixtures/test-1-5.json | 42 +- .../trunk/Tests/Tests/Fixtures/test-1-6.json | 42 +- .../trunk/Tests/Tests/Fixtures/test-2-2.json | 70 ++- .../trunk/Tests/Tests/Fixtures/test-2-3.json | 420 ++++++++++++++++-- .../trunk/Tests/Tests/Fixtures/test-2-4.json | 28 +- .../trunk/Tests/Tests/Fixtures/test-2-5.json | 42 +- .../trunk/Tests/Tests/Fixtures/test-2-6.json | 42 +- 10 files changed, 1118 insertions(+), 86 deletions(-) diff --git a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-2.json b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-2.json index cf3cffcd..e16c01a5 100644 --- a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-2.json +++ b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-2.json @@ -913,7 +913,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -1345,7 +1357,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -2072,7 +2096,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -2504,7 +2540,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -3241,7 +3289,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } diff --git a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-3.json b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-3.json index c9def402..967b3a7d 100644 --- a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-3.json +++ b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-3.json @@ -1188,7 +1188,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -4166,7 +4178,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -7342,7 +7366,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -7684,7 +7720,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -8224,7 +8272,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -8589,7 +8649,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -9047,7 +9119,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -9376,7 +9460,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -10240,7 +10336,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -10502,7 +10610,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -10763,7 +10883,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -11092,7 +11224,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -12002,7 +12146,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -12292,7 +12448,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -12379,7 +12547,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -13175,7 +13355,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -13469,7 +13661,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -13969,7 +14173,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -15051,7 +15267,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -15138,7 +15366,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -15410,7 +15650,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -16067,7 +16319,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -16154,7 +16418,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -16241,7 +16517,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -17003,7 +17291,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -17090,7 +17390,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -17177,7 +17489,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -17463,7 +17787,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -17998,7 +18334,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -18295,7 +18643,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } diff --git a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-4.json b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-4.json index 9ed67574..77c1a43f 100644 --- a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-4.json +++ b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-4.json @@ -1260,7 +1260,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -1759,7 +1771,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } diff --git a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-5.json b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-5.json index b2c47cef..6da3fee7 100644 --- a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-5.json +++ b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-5.json @@ -424,7 +424,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -546,7 +558,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -668,7 +692,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } diff --git a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-6.json b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-6.json index 65727b8e..0348cd5f 100644 --- a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-6.json +++ b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-1-6.json @@ -424,7 +424,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -546,7 +558,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -668,7 +692,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } diff --git a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-2.json b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-2.json index 8f641ae1..a9189f36 100644 --- a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-2.json +++ b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-2.json @@ -911,7 +911,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -1343,7 +1355,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -2068,7 +2092,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -2500,7 +2536,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -3237,7 +3285,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } diff --git a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-3.json b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-3.json index be7ad555..7574ca6a 100644 --- a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-3.json +++ b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-3.json @@ -1188,7 +1188,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -4166,7 +4178,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -7342,7 +7366,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -7684,7 +7720,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -8224,7 +8272,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -8589,7 +8649,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -9047,7 +9119,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -9376,7 +9460,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -10240,7 +10336,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -10502,7 +10610,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -10763,7 +10883,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -11092,7 +11224,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -12002,7 +12146,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -12292,7 +12448,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -12379,7 +12547,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -13175,7 +13355,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -13469,7 +13661,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -13969,7 +14173,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -15051,7 +15267,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -15138,7 +15366,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -15408,7 +15648,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -16065,7 +16317,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -16152,7 +16416,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -16239,7 +16515,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -17001,7 +17289,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -17088,7 +17388,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -17175,7 +17487,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -17459,7 +17783,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -17994,7 +18330,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -18291,7 +18639,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } diff --git a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-4.json b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-4.json index 9ed67574..77c1a43f 100644 --- a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-4.json +++ b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-4.json @@ -1260,7 +1260,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } @@ -1759,7 +1771,19 @@ }, "structure": [ { - "name": "unexpectedBeforeName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndName", "value": { "text": "nil" } diff --git a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-5.json b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-5.json index 68132f81..017a7580 100644 --- a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-5.json +++ b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-5.json @@ -422,7 +422,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -605,7 +617,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -727,7 +751,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } diff --git a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-6.json b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-6.json index 1818af56..912aa693 100644 --- a/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-6.json +++ b/Resources/parsers/trunk/Tests/Tests/Fixtures/test-2-6.json @@ -483,7 +483,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -605,7 +617,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" } @@ -727,7 +751,19 @@ }, "structure": [ { - "name": "unexpectedBeforeBaseName", + "name": "unexpectedBeforeModuleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "moduleSelector", + "value": { + "text": "nil" + } + }, + { + "name": "unexpectedBetweenModuleSelectorAndBaseName", "value": { "text": "nil" }