Skip to content

[Recovery 0a/7] Implement recovery in eat #688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2022
Merged

[Recovery 0a/7] Implement recovery in eat #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 46 additions & 19 deletions Sources/SwiftParser/Attributes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,30 +182,34 @@ extension Parser {
}


let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.eat(.atSign)
let ident = self.consumeIdentifierOrRethrows()
let unexpectedBeforeLeftParen: RawUnexpectedNodesSyntax?
let leftParen: RawTokenSyntax?
let arg: RawSyntax?
let unexpectedBeforeRightParen: RawUnexpectedNodesSyntax?
let rightParen: RawTokenSyntax?
if self.at(.leftParen) {
var args = [RawTokenSyntax]()
leftParen = self.eat(.leftParen)
(unexpectedBeforeLeftParen, leftParen) = self.eat(.leftParen)
var loopProgress = LoopProgressCondition()
while !self.at(.eof) && !self.at(.rightParen) && loopProgress.evaluate(currentToken) {
args.append(self.consumeAnyToken())
}
arg = RawSyntax(RawTokenListSyntax(elements: args, arena: self.arena))
(unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
} else {
unexpectedBeforeLeftParen = nil
leftParen = nil
arg = nil
unexpectedBeforeRightParen = nil
rightParen = nil
}
return RawSyntax(RawAttributeSyntax(
unexpectedBeforeAtSign,
atSignToken: atSign,
attributeName: ident,
unexpectedBeforeLeftParen,
leftParen: leftParen,
argument: arg,
unexpectedBeforeRightParen,
Expand All @@ -215,7 +219,7 @@ extension Parser {
}

mutating func parseCustomAttribute() -> RawCustomAttributeSyntax {
let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.eat(.atSign)
let attrName = self.parseType()

// Custom attributes are stricter than normal attributes about their
Expand All @@ -226,11 +230,14 @@ extension Parser {
leftParen: nil, argumentList: nil, rightParen: nil,
arena: self.arena)
}
let leftParen = self.eat(.leftParen)
let (unexpectedBeforeLeftParen, leftParen) = self.eat(.leftParen)
let arguments = self.parseArgumentListElements()
let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
return RawCustomAttributeSyntax(
atSignToken: atSign, attributeName: attrName,
unexpectedBeforeAtSign,
atSignToken: atSign,
attributeName: attrName,
unexpectedBeforeLeftParen,
leftParen: leftParen,
argumentList: RawTupleExprElementListSyntax(elements: arguments, arena: self.arena),
unexpectedBeforeRightParen,
Expand All @@ -241,7 +248,7 @@ extension Parser {

extension Parser {
mutating func parseAvailabilityAttribute() -> RawAttributeSyntax {
let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.eat(.atSign)
assert(self.currentToken.tokenText == "available")
let available = self.consumeAnyToken()
let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
Expand All @@ -259,6 +266,7 @@ extension Parser {
let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)

return RawAttributeSyntax(
unexpectedBeforeAtSign,
atSignToken: atSign,
attributeName: available,
unexpectedBeforeLeftParen,
Expand All @@ -273,7 +281,7 @@ extension Parser {

extension Parser {
mutating func parseDifferentiableAttribute() -> RawAttributeSyntax {
let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.eat(.atSign)
assert(self.currentToken.tokenText == "differentiable")
let differentiable = self.consumeAnyToken()
let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
Expand All @@ -282,6 +290,7 @@ extension Parser {
let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)

return RawAttributeSyntax(
unexpectedBeforeAtSign,
atSignToken: atSign,
attributeName: differentiable,
unexpectedBeforeLeftParen,
Expand Down Expand Up @@ -355,7 +364,7 @@ extension Parser {
)
}

let leftParen = self.eat(.leftParen)
let (unexpectedBeforeLeftParen, leftParen) = self.eat(.leftParen)
var elements = [RawDifferentiabilityParamSyntax]()
var loopProgress = LoopProgressCondition()
while !self.at(.eof) && !self.at(.rightParen) && loopProgress.evaluate(currentToken) {
Expand All @@ -368,6 +377,7 @@ extension Parser {

let parameters = RawDifferentiabilityParamListSyntax(elements: elements, arena: self.arena)
let list = RawDifferentiabilityParamsSyntax(
unexpectedBeforeLeftParen,
leftParen: leftParen,
diffParams: parameters,
unexpectedBeforeRightParen,
Expand Down Expand Up @@ -396,10 +406,14 @@ extension Parser {
return RawDifferentiabilityParamSyntax(
parameter: RawSyntax(token), trailingComma: comma, arena: self.arena)
case .selfKeyword:
let token = self.eat(.selfKeyword)
let (unexpectedBeforeToken, token) = self.eat(.selfKeyword)
let comma = self.consume(if: .comma)
return RawDifferentiabilityParamSyntax(
parameter: RawSyntax(token), trailingComma: comma, arena: self.arena)
unexpectedBeforeToken,
parameter: RawSyntax(token),
trailingComma: comma,
arena: self.arena
)
default:
return nil
}
Expand All @@ -408,27 +422,32 @@ extension Parser {

extension Parser {
mutating func parseObjectiveCAttribute() -> RawAttributeSyntax {
let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.eat(.atSign)
assert(self.currentToken.tokenText == "objc")
let objc = self.consumeAnyToken()

let unexpectedBeforeLeftParen: RawUnexpectedNodesSyntax?
let leftParen: RawTokenSyntax?
let argument: RawObjCSelectorSyntax?
let unexpectedBeforeRightParen: RawUnexpectedNodesSyntax?
let rightParen: RawTokenSyntax?
if self.at(.leftParen) {
leftParen = self.eat(.leftParen)
(unexpectedBeforeLeftParen, leftParen) = self.eat(.leftParen)
argument = self.parseObjectiveCSelector()
(unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
} else {
unexpectedBeforeLeftParen = nil
leftParen = nil
argument = nil
unexpectedBeforeRightParen = nil
rightParen = nil
}

return RawAttributeSyntax(
atSignToken: atSign, attributeName: objc,
unexpectedBeforeAtSign,
atSignToken: atSign,
attributeName: objc,
unexpectedBeforeLeftParen,
leftParen: leftParen,
argument: argument.map(RawSyntax.init),
unexpectedBeforeRightParen,
Expand All @@ -443,9 +462,13 @@ extension Parser {
while !self.at(.eof) && !self.at(.rightParen) && loopProgress.evaluate(currentToken) {
// Empty selector piece.
if self.at(.colon) {
let colon = self.eat(.colon)
let (unexpectedBeforeColon, colon) = self.eat(.colon)
elements.append(RawObjCSelectorPieceSyntax(
name: nil, colon: colon, arena: self.arena))
name: nil,
unexpectedBeforeColon,
colon: colon,
arena: self.arena
))
continue
}

Expand Down Expand Up @@ -475,13 +498,14 @@ extension Parser {

extension Parser {
mutating func parseSpecializeAttribute() -> RawAttributeSyntax {
let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.eat(.atSign)
assert(self.currentToken.tokenText == "_specialize")
let specializeToken = self.consumeAnyToken()
let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
let argument = self.parseSpecializeAttributeSpecList()
let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
return RawAttributeSyntax(
unexpectedBeforeAtSign,
atSignToken: atSign,
attributeName: specializeToken,
unexpectedBeforeLeftParen,
Expand Down Expand Up @@ -659,7 +683,7 @@ extension Parser {

extension Parser {
mutating func parsePrivateImportAttribute() -> RawAttributeSyntax {
let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.eat(.atSign)
assert(self.currentToken.tokenText == "_private")
let privateToken = self.consumeAnyToken()
let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
Expand All @@ -668,6 +692,7 @@ extension Parser {
let filename = self.consumeAnyToken()
let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
return RawAttributeSyntax(
unexpectedBeforeAtSign,
atSignToken: atSign,
attributeName: privateToken,
unexpectedBeforeLeftParen,
Expand All @@ -688,7 +713,7 @@ extension Parser {

extension Parser {
mutating func parseDynamicReplacementAttribute() -> RawAttributeSyntax {
let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.eat(.atSign)
assert(self.currentToken.tokenText == "_dynamicReplacement")
let dynamicReplacementToken = self.consumeAnyToken()
let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
Expand All @@ -705,6 +730,7 @@ extension Parser {
let method = RawDeclNameSyntax(declBaseName: RawSyntax(base), declNameArguments: args, arena: self.arena)
let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
return RawAttributeSyntax(
unexpectedBeforeAtSign,
atSignToken: atSign,
attributeName: dynamicReplacementToken,
unexpectedBeforeLeftParen,
Expand All @@ -725,13 +751,14 @@ extension Parser {

extension Parser {
mutating func parseSPIAttribute() -> RawAttributeSyntax {
let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.eat(.atSign)
assert(self.currentToken.tokenText == "_spi")
let spiToken = self.consumeAnyToken()
let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
let label = self.consumeAnyToken()
let (unexpectedBeforeRightParen, rightParen) = self.expect(.rightParen)
return RawAttributeSyntax(
unexpectedBeforeAtSign,
atSignToken: atSign,
attributeName: spiToken,
unexpectedBeforeLeftParen,
Expand Down
9 changes: 7 additions & 2 deletions Sources/SwiftParser/Availability.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,15 @@ extension Parser {
case .deprecated:
let argumentLabel = self.consumeAnyToken()
if self.at(.colon) {
let colon = self.eat(.colon)
let (unexpectedBeforeColon, colon) = self.eat(.colon)
let version = self.parseVersionTuple()
entry = RawSyntax(RawAvailabilityLabeledArgumentSyntax(
label: argumentLabel, colon: colon, value: RawSyntax(version), arena: self.arena))
label: argumentLabel,
unexpectedBeforeColon,
colon: colon,
value: RawSyntax(version),
arena: self.arena
))
} else {
entry = RawSyntax(argumentLabel)
}
Expand Down
Loading