Skip to content

[Recovery 0b/7] Eliminate eat from the parser #741

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 5 commits into from
Sep 8, 2022
Merged

[Recovery 0b/7] Eliminate eat from the parser #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25d193d
Implement recovery in `eat`
ahoppen Sep 8, 2022
172f326
Eliminate `eat` from the parser
ahoppen Sep 8, 2022
70eff85
Sink a few functions from Parser down to TokenConsumer
ahoppen Sep 3, 2022
0cc2195
Remove `parser` as argument to the `where` condition of `consume(if:)`
ahoppen Sep 8, 2022
38422e0
Sink some more parser primitives to TokenConsumer
ahoppen Sep 8, 2022
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
97 changes: 61 additions & 36 deletions Sources/SwiftParser/Attributes.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,28 +182,27 @@ extension Parser {
}


let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.expect(.atSign)
let ident = self.consumeIdentifierOrRethrows()
let leftParen: RawTokenSyntax?
let leftParen = self.consume(if: .leftParen)
let arg: RawSyntax?
let unexpectedBeforeRightParen: RawUnexpectedNodesSyntax?
let rightParen: RawTokenSyntax?
if self.at(.leftParen) {
if leftParen != nil {
var args = [RawTokenSyntax]()
leftParen = self.eat(.leftParen)
var loopProgress = LoopProgressCondition()
while !self.at(.eof) && !self.at(.rightParen) && loopProgress.evaluate(currentToken) {
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 {
leftParen = nil
arg = nil
unexpectedBeforeRightParen = nil
rightParen = nil
}
return RawSyntax(RawAttributeSyntax(
unexpectedBeforeAtSign,
atSignToken: atSign,
attributeName: ident,
leftParen: leftParen,
Expand All @@ -215,22 +214,24 @@ extension Parser {
}

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

// Custom attributes are stricter than normal attributes about their
// argument lists "immediately" following the attribute name.
guard self.at(.leftParen) && !self.currentToken.isAtStartOfLine && self.lookahead().isCustomAttributeArgument() else {
guard self.lookahead().isCustomAttributeArgument(),
let leftParen = self.consume(if: .leftParen, where: { !$0.isAtStartOfLine }) else {
return RawCustomAttributeSyntax(
atSignToken: atSign, attributeName: attrName,
leftParen: nil, argumentList: nil, rightParen: nil,
arena: self.arena)
}
let 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,
leftParen: leftParen,
argumentList: RawTupleExprElementListSyntax(elements: arguments, arena: self.arena),
unexpectedBeforeRightParen,
Expand All @@ -241,7 +242,7 @@ extension Parser {

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

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

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

return RawAttributeSyntax(
unexpectedBeforeAtSign,
atSignToken: atSign,
attributeName: differentiable,
unexpectedBeforeLeftParen,
Expand Down Expand Up @@ -342,7 +345,7 @@ extension Parser {
let wrt = self.consumeIdentifier()
let (unexpectedBeforeColon, colon) = self.expect(.colon)

guard self.at(.leftParen) else {
guard let leftParen = self.consume(if: .leftParen) else {
// If no opening '(' for parameter list, parse a single parameter.
let param = self.parseDifferentiabilityParameter().map(RawSyntax.init(_:))
?? RawSyntax(RawMissingSyntax(arena: self.arena))
Expand All @@ -355,7 +358,6 @@ extension Parser {
)
}

let leftParen = self.eat(.leftParen)
var elements = [RawDifferentiabilityParamSyntax]()
var loopProgress = LoopProgressCondition()
while !self.at(.eof) && !self.at(.rightParen) && loopProgress.evaluate(currentToken) {
Expand Down Expand Up @@ -384,51 +386,68 @@ extension Parser {
}

mutating func parseDifferentiabilityParameter() -> RawDifferentiabilityParamSyntax? {
switch self.currentToken.tokenKind {
case .identifier:
let token = self.consumeIdentifier()
enum ExpectedTokenKind: RawTokenKindSubset {
case identifier
case integerLiteral
case selfKeyword

var rawTokenKind: RawTokenKind {
switch self {
case .identifier: return .identifier
case .integerLiteral: return .integerLiteral
case .selfKeyword: return .selfKeyword
}
}
}

switch self.at(anyIn: ExpectedTokenKind.self) {
case (.identifier, let handle)?:
let token = self.eat(handle)
let comma = self.consume(if: .comma)
return RawDifferentiabilityParamSyntax(
parameter: RawSyntax(token), trailingComma: comma, arena: self.arena)
case .integerLiteral:
let token = self.consumeAnyToken()
case (.integerLiteral, let handle)?:
let token = self.eat(handle)
let comma = self.consume(if: .comma)
return RawDifferentiabilityParamSyntax(
parameter: RawSyntax(token), trailingComma: comma, arena: self.arena)
case .selfKeyword:
let token = self.eat(.selfKeyword)
case (.selfKeyword, let handle)?:
let token = self.eat(handle)
let comma = self.consume(if: .comma)
return RawDifferentiabilityParamSyntax(
parameter: RawSyntax(token), trailingComma: comma, arena: self.arena)
default:
parameter: RawSyntax(token),
trailingComma: comma,
arena: self.arena
)
case nil:
return nil
}
}
}

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

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

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

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

extension Parser {
mutating func parseSpecializeAttribute() -> RawAttributeSyntax {
let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.expect(.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 +681,7 @@ extension Parser {

extension Parser {
mutating func parsePrivateImportAttribute() -> RawAttributeSyntax {
let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.expect(.atSign)
assert(self.currentToken.tokenText == "_private")
let privateToken = self.consumeAnyToken()
let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
Expand All @@ -668,6 +690,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 +711,7 @@ extension Parser {

extension Parser {
mutating func parseDynamicReplacementAttribute() -> RawAttributeSyntax {
let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.expect(.atSign)
assert(self.currentToken.tokenText == "_dynamicReplacement")
let dynamicReplacementToken = self.consumeAnyToken()
let (unexpectedBeforeLeftParen, leftParen) = self.expect(.leftParen)
Expand All @@ -705,6 +728,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 +749,14 @@ extension Parser {

extension Parser {
mutating func parseSPIAttribute() -> RawAttributeSyntax {
let atSign = self.eat(.atSign)
let (unexpectedBeforeAtSign, atSign) = self.expect(.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: 6 additions & 3 deletions Sources/SwiftParser/Availability.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,11 +131,14 @@ extension Parser {
))
case .deprecated:
let argumentLabel = self.consumeAnyToken()
if self.at(.colon) {
let colon = self.eat(.colon)
if let colon = self.consume(if: .colon) {
let version = self.parseVersionTuple()
entry = RawSyntax(RawAvailabilityLabeledArgumentSyntax(
label: argumentLabel, colon: colon, value: RawSyntax(version), arena: self.arena))
label: argumentLabel,
colon: colon,
value: RawSyntax(version),
arena: self.arena
))
} else {
entry = RawSyntax(argumentLabel)
}
Expand Down
Loading