@@ -227,12 +227,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
227
227
case . accessPathComponent:
228
228
assert ( layout. count == 5 )
229
229
assertNoError ( kind, 0 , verify ( layout [ 0 ] , as: RawUnexpectedNodesSyntax ? . self) )
230
- assertNoError ( kind, 1 , verify ( layout [ 1 ] , as: RawTokenSyntax . self, tokenChoices: [
231
- . tokenKind( . identifier) ,
232
- . tokenKind( . binaryOperator) ,
233
- . tokenKind( . prefixOperator) ,
234
- . tokenKind( . postfixOperator)
235
- ] ) )
230
+ assertNoError ( kind, 1 , verify ( layout [ 1 ] , as: RawTokenSyntax . self, tokenChoices: [ . tokenKind( . identifier) ] ) )
236
231
assertNoError ( kind, 2 , verify ( layout [ 2 ] , as: RawUnexpectedNodesSyntax ? . self) )
237
232
assertNoError ( kind, 3 , verify ( layout [ 3 ] , as: RawTokenSyntax ? . self, tokenChoices: [ . tokenKind( . period) ] ) )
238
233
assertNoError ( kind, 4 , verify ( layout [ 4 ] , as: RawUnexpectedNodesSyntax ? . self) )
@@ -835,13 +830,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
835
830
case . declName:
836
831
assert ( layout. count == 5 )
837
832
assertNoError ( kind, 0 , verify ( layout [ 0 ] , as: RawUnexpectedNodesSyntax ? . self) )
838
- assertNoError ( kind, 1 , verify ( layout [ 1 ] , as: RawTokenSyntax . self, tokenChoices: [
839
- . tokenKind( . identifier) ,
840
- . tokenKind( . binaryOperator) ,
841
- . keyword( " init " ) ,
842
- . keyword( " self " ) ,
843
- . keyword( " Self " )
844
- ] ) )
833
+ assertNoError ( kind, 1 , verify ( layout [ 1 ] , as: RawTokenSyntax . self, tokenChoices: [ . tokenKind( . identifier) , . tokenKind( . prefixOperator) , . keyword( " init " ) ] ) )
845
834
assertNoError ( kind, 2 , verify ( layout [ 2 ] , as: RawUnexpectedNodesSyntax ? . self) )
846
835
assertNoError ( kind, 3 , verify ( layout [ 3 ] , as: RawDeclNameArgumentsSyntax ? . self) )
847
836
assertNoError ( kind, 4 , verify ( layout [ 4 ] , as: RawUnexpectedNodesSyntax ? . self) )
@@ -962,7 +951,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
962
951
case . differentiableAttributeArguments:
963
952
assert ( layout. count == 11 )
964
953
assertNoError ( kind, 0 , verify ( layout [ 0 ] , as: RawUnexpectedNodesSyntax ? . self) )
965
- assertNoError ( kind, 1 , verify ( layout [ 1 ] , as: RawTokenSyntax ? . self, tokenChoices: [ . keyword( " _forward " ) , . keyword( " reverse " ) , . keyword( " _linear " ) ] ) )
954
+ assertNoError ( kind, 1 , verify ( layout [ 1 ] , as: RawTokenSyntax ? . self, tokenChoices: [ . keyword( " forward " ) , . keyword( " reverse " ) , . keyword( " linear " ) ] ) )
966
955
assertNoError ( kind, 2 , verify ( layout [ 2 ] , as: RawUnexpectedNodesSyntax ? . self) )
967
956
assertNoError ( kind, 3 , verify ( layout [ 3 ] , as: RawTokenSyntax ? . self, tokenChoices: [ . tokenKind( . comma) ] ) )
968
957
assertNoError ( kind, 4 , verify ( layout [ 4 ] , as: RawUnexpectedNodesSyntax ? . self) )
@@ -1019,12 +1008,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
1019
1008
case . editorPlaceholderExpr:
1020
1009
assert ( layout. count == 3 )
1021
1010
assertNoError ( kind, 0 , verify ( layout [ 0 ] , as: RawUnexpectedNodesSyntax ? . self) )
1022
- assertNoError ( kind, 1 , verify ( layout [ 1 ] , as: RawTokenSyntax . self, tokenChoices: [
1023
- . tokenKind( . identifier) ,
1024
- . keyword( " self " ) ,
1025
- . keyword( " Self " ) ,
1026
- . keyword( " init " )
1027
- ] ) )
1011
+ assertNoError ( kind, 1 , verify ( layout [ 1 ] , as: RawTokenSyntax . self, tokenChoices: [ . tokenKind( . identifier) ] ) )
1028
1012
assertNoError ( kind, 2 , verify ( layout [ 2 ] , as: RawUnexpectedNodesSyntax ? . self) )
1029
1013
case . effectsArguments:
1030
1014
for (index, element) in layout. enumerated ( ) {
@@ -1561,7 +1545,14 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
1561
1545
case . labeledSpecializeEntry:
1562
1546
assert ( layout. count == 9 )
1563
1547
assertNoError ( kind, 0 , verify ( layout [ 0 ] , as: RawUnexpectedNodesSyntax ? . self) )
1564
- assertNoError ( kind, 1 , verify ( layout [ 1 ] , as: RawTokenSyntax . self) )
1548
+ assertNoError ( kind, 1 , verify ( layout [ 1 ] , as: RawTokenSyntax . self, tokenChoices: [
1549
+ . tokenKind( . identifier) ,
1550
+ . keyword( " available " ) ,
1551
+ . keyword( " exported " ) ,
1552
+ . keyword( " kind " ) ,
1553
+ . keyword( " spi " ) ,
1554
+ . keyword( " spiModule " )
1555
+ ] ) )
1565
1556
assertNoError ( kind, 2 , verify ( layout [ 2 ] , as: RawUnexpectedNodesSyntax ? . self) )
1566
1557
assertNoError ( kind, 3 , verify ( layout [ 3 ] , as: RawTokenSyntax . self, tokenChoices: [ . tokenKind( . colon) ] ) )
1567
1558
assertNoError ( kind, 4 , verify ( layout [ 4 ] , as: RawUnexpectedNodesSyntax ? . self) )
@@ -1785,7 +1776,7 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
1785
1776
case . objCSelectorPiece:
1786
1777
assert ( layout. count == 5 )
1787
1778
assertNoError ( kind, 0 , verify ( layout [ 0 ] , as: RawUnexpectedNodesSyntax ? . self) )
1788
- assertNoError ( kind, 1 , verify ( layout [ 1 ] , as: RawTokenSyntax ? . self) )
1779
+ assertNoError ( kind, 1 , verify ( layout [ 1 ] , as: RawTokenSyntax ? . self, tokenChoices : [ . tokenKind ( . identifier ) ] ) )
1789
1780
assertNoError ( kind, 2 , verify ( layout [ 2 ] , as: RawUnexpectedNodesSyntax ? . self) )
1790
1781
assertNoError ( kind, 3 , verify ( layout [ 3 ] , as: RawTokenSyntax ? . self, tokenChoices: [ . tokenKind( . colon) ] ) )
1791
1782
assertNoError ( kind, 4 , verify ( layout [ 4 ] , as: RawUnexpectedNodesSyntax ? . self) )
@@ -2076,10 +2067,9 @@ func validateLayout(layout: RawSyntaxBuffer, as kind: SyntaxKind) {
2076
2067
assertNoError ( kind, 4 , verify ( layout [ 4 ] , as: RawUnexpectedNodesSyntax ? . self) )
2077
2068
assertNoError ( kind, 5 , verify ( layout [ 5 ] , as: RawTokenSyntax . self, tokenChoices: [
2078
2069
. tokenKind( . identifier) ,
2079
- . keyword( " self " ) ,
2080
- . keyword( " Self " ) ,
2081
- . keyword( " init " ) ,
2082
- . tokenKind( . binaryOperator)
2070
+ . tokenKind( . binaryOperator) ,
2071
+ . tokenKind( . prefixOperator) ,
2072
+ . tokenKind( . postfixOperator)
2083
2073
] ) )
2084
2074
assertNoError ( kind, 6 , verify ( layout [ 6 ] , as: RawUnexpectedNodesSyntax ? . self) )
2085
2075
assertNoError ( kind, 7 , verify ( layout [ 7 ] , as: RawDeclNameArgumentsSyntax ? . self) )
0 commit comments