Skip to content

Commit 917134a

Browse files
ahoppenahoppen
committed
Change LoopProgressCondition.evaluate to TokenConsumer.hasProgressed 
1 parent 842ebae commit 917134a

19 files changed

+103
-111
lines changed

‎Sources/SwiftParser/Attributes.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extension Parser {
2323
repeat {
2424
let attribute = self.parseAttribute()
2525
elements.append(attribute)
26-
} while self.at(.atSign, .poundIfKeyword) && loopProgress.evaluate(self)
26+
} while self.at(.atSign, .poundIfKeyword) && self.hasProgressed(&loopProgress)
2727
return RawAttributeListSyntax(elements: elements, arena: self.arena)
2828
}
2929
}
@@ -453,7 +453,7 @@ extension Parser {
453453

454454
var elements = [RawDifferentiabilityParamSyntax]()
455455
var loopProgress = LoopProgressCondition()
456-
while !self.at(.endOfFile, .rightParen) && loopProgress.evaluate(self) {
456+
while !self.at(.endOfFile, .rightParen) && self.hasProgressed(&loopProgress) {
457457
guard let param = self.parseDifferentiabilityParameter() else {
458458
break
459459
}
@@ -594,7 +594,7 @@ extension Parser {
594594
mutating func parseObjectiveCSelector() -> RawObjCSelectorSyntax {
595595
var elements = [RawObjCSelectorPieceSyntax]()
596596
var loopProgress = LoopProgressCondition()
597-
while loopProgress.evaluate(self) {
597+
while self.hasProgressed(&loopProgress) {
598598
// Empty selector piece.
599599
if let colon = self.consume(if: .colon) {
600600
elements.append(
@@ -676,7 +676,7 @@ extension Parser {
676676
var elements = [RawSpecializeAttributeSpecListSyntax.Element]()
677677
// Parse optional "exported" and "kind" labeled parameters.
678678
var loopProgress = LoopProgressCondition()
679-
while !self.at(.endOfFile, .rightParen, .keyword(.where)) && loopProgress.evaluate(self) {
679+
while !self.at(.endOfFile, .rightParen, .keyword(.where)) && self.hasProgressed(&loopProgress) {
680680
switch self.at(anyIn: SpecializeParameter.self) {
681681
case (.target, let handle)?:
682682
let ident = self.eat(handle)

‎Sources/SwiftParser/Availability.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extension Parser {
4848
arena: self.arena
4949
)
5050
)
51-
} while keepGoing != nil && availabilityArgumentProgress.evaluate(self)
51+
} while keepGoing != nil && self.hasProgressed(&availabilityArgumentProgress)
5252
}
5353

5454
return RawAvailabilitySpecListSyntax(elements: elements, arena: self.arena)
@@ -99,7 +99,7 @@ extension Parser {
9999
var elements = [RawAvailabilityArgumentSyntax]()
100100
var keepGoing: RawTokenSyntax? = nil
101101

102-
var loopProgressCondition = LoopProgressCondition()
102+
var loopProgress = LoopProgressCondition()
103103
LOOP: repeat {
104104
let entry: RawAvailabilityArgumentSyntax.Entry
105105
switch self.at(anyIn: AvailabilityArgumentKind.self) {
@@ -176,7 +176,7 @@ extension Parser {
176176
arena: self.arena
177177
)
178178
)
179-
} while keepGoing != nil && loopProgressCondition.evaluate(self)
179+
} while keepGoing != nil && self.hasProgressed(&loopProgress)
180180
return RawAvailabilitySpecListSyntax(elements: elements, arena: self.arena)
181181
}
182182

@@ -266,7 +266,7 @@ extension Parser {
266266
unexpectedTokens.append(unexpectedVersion)
267267
}
268268
keepGoing = self.consume(if: .period)
269-
} while keepGoing != nil && loopProgress.evaluate(self)
269+
} while keepGoing != nil && self.hasProgressed(&loopProgress)
270270
return RawUnexpectedNodesSyntax(unexpectedTokens, arena: self.arena)
271271
}
272272

‎Sources/SwiftParser/Declarations.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ extension TokenConsumer {
6161

6262
var hasAttribute = false
6363
var attributeProgress = LoopProgressCondition()
64-
while attributeProgress.evaluate(subparser) && subparser.at(.atSign) {
64+
while subparser.hasProgressed(&attributeProgress) && subparser.at(.atSign) {
6565
hasAttribute = true
6666
_ = subparser.consumeAttributeList()
6767
}
@@ -71,7 +71,7 @@ extension TokenConsumer {
7171
var modifierProgress = LoopProgressCondition()
7272
while let (modifierKind, handle) = subparser.at(anyIn: DeclarationModifier.self),
7373
modifierKind != .class,
74-
modifierProgress.evaluate(subparser)
74+
subparser.hasProgressed(&modifierProgress)
7575
{
7676
hasModifier = true
7777
subparser.eat(handle)
@@ -356,7 +356,7 @@ extension Parser {
356356
arena: self.arena
357357
)
358358
)
359-
} while keepGoing != nil && loopProgress.evaluate(self)
359+
} while keepGoing != nil && self.hasProgressed(&loopProgress)
360360
return RawImportPathSyntax(elements: elements, arena: self.arena)
361361
}
362362
}
@@ -508,7 +508,7 @@ extension Parser {
508508
arena: self.arena
509509
)
510510
)
511-
} while keepGoing != nil && loopProgress.evaluate(self)
511+
} while keepGoing != nil && self.hasProgressed(&loopProgress)
512512
}
513513

514514
let whereClause: RawGenericWhereClauseSyntax?
@@ -719,7 +719,7 @@ extension Parser {
719719
arena: self.arena
720720
)
721721
)
722-
} while keepGoing != nil && loopProgress.evaluate(self)
722+
} while keepGoing != nil && self.hasProgressed(&loopProgress)
723723
}
724724

725725
return RawGenericWhereClauseSyntax(
@@ -785,7 +785,7 @@ extension Parser {
785785
let (unexpectedBeforeLBrace, lbrace) = self.expect(.leftBrace)
786786
do {
787787
var loopProgress = LoopProgressCondition()
788-
while !self.at(.endOfFile, .rightBrace) && loopProgress.evaluate(self) {
788+
while !self.at(.endOfFile, .rightBrace) && self.hasProgressed(&loopProgress) {
789789
let newItemAtStartOfLine = self.atStartOfLine
790790
guard let newElement = self.parseMemberDeclListItem() else {
791791
break
@@ -885,7 +885,7 @@ extension Parser {
885885
arena: self.arena
886886
)
887887
)
888-
} while keepGoing != nil && loopProgress.evaluate(self)
888+
} while keepGoing != nil && self.hasProgressed(&loopProgress)
889889
}
890890

891891
return RawEnumCaseDeclSyntax(
@@ -1403,7 +1403,7 @@ extension Parser {
14031403
arena: self.arena
14041404
)
14051405
)
1406-
} while keepGoing != nil && loopProgress.evaluate(self)
1406+
} while keepGoing != nil && self.hasProgressed(&loopProgress)
14071407
}
14081408

14091409
return RawVariableDeclSyntax(
@@ -1548,7 +1548,7 @@ extension Parser {
15481548
var elements = [RawAccessorDeclSyntax]()
15491549
do {
15501550
var loopProgress = LoopProgressCondition()
1551-
while !self.at(.endOfFile, .rightBrace) && loopProgress.evaluate(self) {
1551+
while !self.at(.endOfFile, .rightBrace) && self.hasProgressed(&loopProgress) {
15521552
guard let introducer = self.parseAccessorIntroducer() else {
15531553
// There can only be an implicit getter if no other accessors were
15541554
// seen before this one.
@@ -1768,7 +1768,7 @@ extension Parser {
17681768
while (identifiersAfterOperatorName.last ?? name).trailingTriviaByteLength == 0,
17691769
self.currentToken.leadingTriviaByteLength == 0,
17701770
!self.at(.colon, .leftBrace, .endOfFile),
1771-
loopProgress.evaluate(self)
1771+
self.hasProgressed(&loopProgress)
17721772
{
17731773
identifiersAfterOperatorName.append(consumeAnyToken())
17741774
}
@@ -1915,7 +1915,7 @@ extension Parser {
19151915
var elements = [RawPrecedenceGroupAttributeListSyntax.Element]()
19161916
do {
19171917
var attributesProgress = LoopProgressCondition()
1918-
LOOP: while !self.at(.endOfFile, .rightBrace) && attributesProgress.evaluate(self) {
1918+
LOOP: while !self.at(.endOfFile, .rightBrace) && self.hasProgressed(&attributesProgress) {
19191919
switch self.at(anyIn: LabelText.self) {
19201920
case (.associativity, let handle)?:
19211921
let associativity = self.eat(handle)
@@ -1979,7 +1979,7 @@ extension Parser {
19791979
arena: self.arena
19801980
)
19811981
)
1982-
} while keepGoing != nil && namesProgress.evaluate(self)
1982+
} while keepGoing != nil && self.hasProgressed(&namesProgress)
19831983
}
19841984
elements.append(
19851985
.precedenceGroupRelation(

‎Sources/SwiftParser/Directives.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ extension Parser {
121121

122122
// Proceed to parse #if continuation clauses (#elseif, #else, check #elif typo, #endif)
123123
var loopProgress = LoopProgressCondition()
124-
LOOP: while let (match, handle) = self.canRecoverTo(anyIn: IfConfigContinuationClauseStartKeyword.self), loopProgress.evaluate(self) {
124+
LOOP: while let (match, handle) = self.canRecoverTo(anyIn: IfConfigContinuationClauseStartKeyword.self), self.hasProgressed(&loopProgress) {
125125
var unexpectedBeforePoundKeyword: RawUnexpectedNodesSyntax?
126126
var poundKeyword: RawTokenSyntax
127127
let condition: RawExprSyntax?
@@ -208,7 +208,7 @@ extension Parser {
208208
while !self.at(.endOfFile)
209209
&& !self.at(.poundElseKeyword, .poundElseifKeyword, .poundEndifKeyword)
210210
&& !self.atElifTypo()
211-
&& elementsProgress.evaluate(self)
211+
&& self.hasProgressed(&elementsProgress)
212212
{
213213
let newItemAtStartOfLine = self.atStartOfLine
214214
guard let element = parseElement(&self, elements.isEmpty), !element.isEmpty else {

‎Sources/SwiftParser/Expressions.swift

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ extension Parser {
150150
pattern: pattern
151151
)
152152

153-
var loopCondition = LoopProgressCondition()
154-
while loopCondition.evaluate(self) {
153+
var loopProgress = LoopProgressCondition()
154+
while self.hasProgressed(&loopProgress) {
155155
guard
156156
!lastElement.is(RawMissingExprSyntax.self),
157157
!(forDirective && self.atStartOfLine)
@@ -805,8 +805,8 @@ extension Parser {
805805
) -> RawExprSyntax {
806806
// Handle suffix expressions.
807807
var leadingExpr = start
808-
var loopCondition = LoopProgressCondition()
809-
while loopCondition.evaluate(self) {
808+
var loopProgress = LoopProgressCondition()
809+
while self.hasProgressed(&loopProgress) {
810810
if forDirective && self.atStartOfLine {
811811
return leadingExpr
812812
}
@@ -963,7 +963,7 @@ extension Parser {
963963
while !backtrack.at(.endOfFile) && !backtrack.currentToken.isAtStartOfLine {
964964
backtrack.skipSingle()
965965
}
966-
} while backtrack.at(.poundIfKeyword) && loopProgress.evaluate(backtrack)
966+
} while backtrack.at(.poundIfKeyword) && backtrack.hasProgressed(&loopProgress)
967967

968968
guard backtrack.isAtStartOfPostfixExprSuffix() else {
969969
break
@@ -1085,8 +1085,8 @@ extension Parser {
10851085
}
10861086

10871087
var components: [RawKeyPathComponentSyntax] = []
1088-
var loopCondition = LoopProgressCondition()
1089-
while loopCondition.evaluate(self) {
1088+
var loopProgress = LoopProgressCondition()
1089+
while self.hasProgressed(&loopProgress) {
10901090
// Check for a [] or .[] suffix. The latter is only permitted when there
10911091
// are no components.
10921092
if self.at(TokenSpec(.leftSquare, allowAtStartOfLine: false))
@@ -1691,8 +1691,8 @@ extension Parser {
16911691
var elementKind: CollectionKind? = nil
16921692
var elements = [RawSyntax]()
16931693
do {
1694-
var collectionLoopCondition = LoopProgressCondition()
1695-
COLLECTION_LOOP: while collectionLoopCondition.evaluate(self) {
1694+
var collectionProgress = LoopProgressCondition()
1695+
COLLECTION_LOOP: while self.hasProgressed(&collectionProgress) {
16961696
elementKind = self.parseCollectionElement(elementKind)
16971697

16981698
// Parse the ',' if exists.
@@ -1936,7 +1936,7 @@ extension Parser {
19361936
arena: self.arena
19371937
)
19381938
)
1939-
} while keepGoing != nil && loopProgress.evaluate(self)
1939+
} while keepGoing != nil && self.hasProgressed(&loopProgress)
19401940
}
19411941
// We were promised a right square bracket, so we're going to get it.
19421942
var unexpectedNodes = [RawSyntax]()
@@ -1991,7 +1991,7 @@ extension Parser {
19911991
arena: self.arena
19921992
)
19931993
)
1994-
} while keepGoing != nil && loopProgress.evaluate(self)
1994+
} while keepGoing != nil && self.hasProgressed(&loopProgress)
19951995
}
19961996

19971997
parameterClause = .simpleInput(RawClosureParamListSyntax(elements: params, arena: self.arena))
@@ -2130,7 +2130,7 @@ extension Parser {
21302130
arena: self.arena
21312131
)
21322132
)
2133-
} while keepGoing != nil && loopProgress.evaluate(self)
2133+
} while keepGoing != nil && self.hasProgressed(&loopProgress)
21342134
return result
21352135
}
21362136
}
@@ -2151,7 +2151,7 @@ extension Parser {
21512151
// Parse labeled trailing closures.
21522152
var elements = [RawMultipleTrailingClosureElementSyntax]()
21532153
var loopProgress = LoopProgressCondition()
2154-
while self.withLookahead({ $0.isStartOfLabelledTrailingClosure() }) && loopProgress.evaluate(self) {
2154+
while self.withLookahead({ $0.isStartOfLabelledTrailingClosure() }) && self.hasProgressed(&loopProgress) {
21552155
let (unexpectedBeforeLabel, label) = self.parseArgumentLabel()
21562156
let (unexpectedBeforeColon, colon) = self.expect(.colon)
21572157
let closure = self.parseClosureExpression()
@@ -2248,7 +2248,7 @@ extension Parser.Lookahead {
22482248
var loopProgress = LoopProgressCondition()
22492249
while !backtrack.at(.endOfFile, .rightBrace)
22502250
&& !backtrack.at(.poundEndifKeyword, .poundElseKeyword, .poundElseifKeyword)
2251-
&& loopProgress.evaluate(backtrack)
2251+
&& backtrack.hasProgressed(&loopProgress)
22522252
{
22532253
backtrack.skipSingle()
22542254
}
@@ -2400,7 +2400,7 @@ extension Parser {
24002400
var elements = [RawSwitchCaseListSyntax.Element]()
24012401
var elementsProgress = LoopProgressCondition()
24022402
while !self.at(.endOfFile, .rightBrace) && !self.at(.poundEndifKeyword, .poundElseifKeyword, .poundElseKeyword)
2403-
&& elementsProgress.evaluate(self)
2403+
&& self.hasProgressed(&elementsProgress)
24042404
{
24052405
if self.withLookahead({ $0.isAtStartOfSwitchCase(allowRecovery: false) }) {
24062406
elements.append(.switchCase(self.parseSwitchCase()))
@@ -2564,7 +2564,7 @@ extension Parser {
25642564
arena: self.arena
25652565
)
25662566
)
2567-
} while keepGoing != nil && loopProgress.evaluate(self)
2567+
} while keepGoing != nil && self.hasProgressed(&loopProgress)
25682568
}
25692569
let (unexpectedBeforeColon, colon) = self.expect(.colon)
25702570
return RawSwitchCaseLabelSyntax(
@@ -2677,7 +2677,7 @@ extension Parser.Lookahead {
26772677
mutating func consumeEffectsSpecifiers() {
26782678
var loopProgress = LoopProgressCondition()
26792679
while let (_, handle) = self.at(anyIn: EffectSpecifier.self),
2680-
loopProgress.evaluate(self)
2680+
self.hasProgressed(&loopProgress)
26812681
{
26822682
self.eat(handle)
26832683
}
@@ -2687,7 +2687,7 @@ extension Parser.Lookahead {
26872687
// Consume attributes.
26882688
var lookahead = self.lookahead()
26892689
var attributesProgress = LoopProgressCondition()
2690-
while let _ = lookahead.consume(if: .atSign), attributesProgress.evaluate(lookahead) {
2690+
while let _ = lookahead.consume(if: .atSign), lookahead.hasProgressed(&attributesProgress) {
26912691
guard lookahead.at(.identifier) else {
26922692
break
26932693
}
@@ -2707,7 +2707,7 @@ extension Parser.Lookahead {
27072707

27082708
// While we don't have '->' or ')', eat balanced tokens.
27092709
var skipProgress = LoopProgressCondition()
2710-
while !lookahead.at(.endOfFile, .rightParen) && skipProgress.evaluate(lookahead) {
2710+
while !lookahead.at(.endOfFile, .rightParen) && lookahead.hasProgressed(&skipProgress) {
27112711
lookahead.skipSingle()
27122712
}
27132713

@@ -2730,7 +2730,7 @@ extension Parser.Lookahead {
27302730
lookahead.consumeAnyToken()
27312731

27322732
var parametersProgress = LoopProgressCondition()
2733-
while lookahead.consume(if: .comma) != nil && parametersProgress.evaluate(lookahead) {
2733+
while lookahead.consume(if: .comma) != nil && lookahead.hasProgressed(&parametersProgress) {
27342734
if lookahead.at(.identifier) || lookahead.at(.wildcard) {
27352735
lookahead.consumeAnyToken()
27362736
continue

‎Sources/SwiftParser/Lookahead.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ extension Parser.Lookahead {
222222
self.skipUntilEndOfLine()
223223

224224
var attributesLoopProgress = LoopProgressCondition()
225-
ATTRIBUTE_LOOP: while attributesLoopProgress.evaluate(self) {
225+
ATTRIBUTE_LOOP: while self.hasProgressed(&attributesLoopProgress) {
226226
switch self.currentToken.rawTokenKind {
227227
case .atSign:
228228
didSeeAnyAttributes = true
@@ -233,7 +233,7 @@ extension Parser.Lookahead {
233233
break ATTRIBUTE_LOOP
234234
}
235235
}
236-
} while self.at(.poundElseifKeyword, .poundElseKeyword) && poundIfLoopProgress.evaluate(self)
236+
} while self.at(.poundElseifKeyword, .poundElseKeyword) && self.hasProgressed(&poundIfLoopProgress)
237237

238238
return didSeeAnyAttributes && self.atStartOfLine && self.consume(if: .poundEndifKeyword) != nil
239239
}

0 commit comments

Comments
 (0)