Skip to content

Commit 725d6c2

Browse files
Ungate SE0439 accepted parts
1 parent 1db511e commit 725d6c2

File tree

8 files changed

+112
-125
lines changed

8 files changed

+112
-125
lines changed

Sources/SwiftParser/Attributes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ extension Parser {
378378
return parseAttribute(argumentMode: .customAttribute) { parser in
379379
let arguments = parser.parseArgumentListElements(
380380
pattern: .none,
381-
allowTrailingComma: parser.experimentalFeatures.contains(.trailingComma)
381+
allowTrailingComma: true
382382
)
383383
return .argumentList(RawLabeledExprListSyntax(elements: arguments, arena: parser.arena))
384384
}

Sources/SwiftParser/Availability.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,13 @@ extension Parser {
4747
arena: self.arena
4848
)
4949
)
50-
} while keepGoing != nil && !self.atAvailabilitySpecListTerminator()
50+
} while keepGoing != nil
5151
&& self.hasProgressed(&availabilityArgumentProgress)
5252
}
5353

5454
return RawAvailabilityArgumentListSyntax(elements: elements, arena: self.arena)
5555
}
5656

57-
mutating func atAvailabilitySpecListTerminator() -> Bool {
58-
return self.experimentalFeatures.contains(.trailingComma) && self.at(.rightParen)
59-
}
60-
6157
enum AvailabilityArgumentKind: TokenSpecSet {
6258
case message
6359
case renamed

Sources/SwiftParser/Declarations.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ extension Parser {
520520
}
521521

522522
mutating func atGenericParametersListTerminator() -> Bool {
523-
return self.experimentalFeatures.contains(.trailingComma) && self.at(prefix: ">")
523+
return self.at(prefix: ">")
524524
}
525525

526526
mutating func parseGenericWhereClause() -> RawGenericWhereClauseSyntax {
@@ -2039,7 +2039,7 @@ extension Parser {
20392039
if leftParen != nil {
20402040
args = parseArgumentListElements(
20412041
pattern: .none,
2042-
allowTrailingComma: self.experimentalFeatures.contains(.trailingComma)
2042+
allowTrailingComma: true
20432043
)
20442044
(unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
20452045
} else {

Sources/SwiftParser/Expressions.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ extension Parser {
749749
let args = self.parseArgumentListElements(
750750
pattern: pattern,
751751
flavor: flavor.callArgumentFlavor,
752-
allowTrailingComma: experimentalFeatures.contains(.trailingComma)
752+
allowTrailingComma: true
753753
)
754754
let (unexpectedBeforeRParen, rparen) = self.expect(.rightParen)
755755

@@ -788,7 +788,7 @@ extension Parser {
788788
} else {
789789
args = self.parseArgumentListElements(
790790
pattern: pattern,
791-
allowTrailingComma: self.experimentalFeatures.contains(.trailingComma)
791+
allowTrailingComma: true
792792
)
793793
}
794794
let (unexpectedBeforeRSquare, rsquare) = self.expect(.rightSquare)
@@ -1024,7 +1024,7 @@ extension Parser {
10241024
} else {
10251025
args = self.parseArgumentListElements(
10261026
pattern: pattern,
1027-
allowTrailingComma: self.experimentalFeatures.contains(.trailingComma)
1027+
allowTrailingComma: true
10281028
)
10291029
}
10301030
let (unexpectedBeforeRSquare, rsquare) = self.expect(.rightSquare)
@@ -1322,7 +1322,7 @@ extension Parser {
13221322
if leftParen != nil {
13231323
args = parseArgumentListElements(
13241324
pattern: pattern,
1325-
allowTrailingComma: self.experimentalFeatures.contains(.trailingComma)
1325+
allowTrailingComma: true
13261326
)
13271327
(unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
13281328
} else {
@@ -1439,7 +1439,7 @@ extension Parser {
14391439
let (unexpectedBeforeLParen, lparen) = self.expect(.leftParen)
14401440
let elements = self.parseArgumentListElements(
14411441
pattern: pattern,
1442-
allowTrailingComma: experimentalFeatures.contains(.trailingComma)
1442+
allowTrailingComma: true
14431443
)
14441444
let (unexpectedBeforeRParen, rparen) = self.expect(.rightParen)
14451445
return RawTupleExprSyntax(

Sources/SwiftParser/StringLiterals.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ extension Parser {
553553
let expressions = RawLabeledExprListSyntax(
554554
elements: self.parseArgumentListElements(
555555
pattern: .none,
556-
allowTrailingComma: self.experimentalFeatures.contains(.trailingComma)
556+
allowTrailingComma: true
557557
),
558558
arena: self.arena
559559
)

Sources/SwiftParser/Types.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1027,7 +1027,7 @@ extension Parser {
10271027
return parseAttribute(argumentMode: .customAttribute) { parser in
10281028
let arguments = parser.parseArgumentListElements(
10291029
pattern: .none,
1030-
allowTrailingComma: parser.experimentalFeatures.contains(.trailingComma)
1030+
allowTrailingComma: true
10311031
)
10321032
return .argumentList(RawLabeledExprListSyntax(elements: arguments, arena: parser.arena))
10331033
}

0 commit comments

Comments
 (0)