Skip to content

Commit d854fe3

Browse files
kimdvkimdv
authored
Merge pull request #1752 from kimdv/kimdv/1747-precedencegrouprelationsyntaxhigherthanorlowerthan-should-be-named-higherthanorlowerthankeyword
2 parents eda1b7c + de6e38b commit d854fe3

File tree

9 files changed

+93
-35
lines changed

9 files changed

+93
-35
lines changed

‎CodeGeneration/Sources/SyntaxSupport/DeclNodes.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1903,7 +1903,7 @@ public let DECL_NODES: [Node] = [
19031903
documentation: "Specify the new precedence group's relation to existing precedence groups.",
19041904
children: [
19051905
Child(
1906-
name: "HigherThanOrLowerThan",
1906+
name: "HigherThanOrLowerThanKeyword",
19071907
kind: .token(choices: [.keyword(text: "higherThan"), .keyword(text: "lowerThan")]),
19081908
documentation: "The relation to specified other precedence groups.",
19091909
classification: "Keyword"

‎Sources/SwiftIDEUtils/generated/SyntaxClassification.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ extension SyntaxClassification {
9191
return (.operatorIdentifier, false)
9292
case \PrecedenceGroupAssociativitySyntax.associativityKeyword:
9393
return (.keyword, false)
94-
case \PrecedenceGroupRelationSyntax.higherThanOrLowerThan:
94+
case \PrecedenceGroupRelationSyntax.higherThanOrLowerThanKeyword:
9595
return (.keyword, false)
9696
case \SimpleTypeIdentifierSyntax.name:
9797
return (.typeIdentifier, false)

‎Sources/SwiftOperators/OperatorTable+Semantics.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extension PrecedenceGroup {
2323
switch attr {
2424
// Relation (lowerThan, higherThan)
2525
case .precedenceGroupRelation(let relation):
26-
let isLowerThan = relation.higherThanOrLowerThan.text == "lowerThan"
26+
let isLowerThan = relation.higherThanOrLowerThanKeyword.text == "lowerThan"
2727
for otherGroup in relation.otherNames {
2828
let otherGroupName = otherGroup.name.text
2929
let relationKind: PrecedenceRelation.Kind =

‎Sources/SwiftOperators/SyntaxSynthesis.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ extension PrecedenceRelation {
5656
indentation: Int = 4
5757
) -> PrecedenceGroupRelationSyntax {
5858
PrecedenceGroupRelationSyntax(
59-
higherThanOrLowerThan: .keyword(
59+
higherThanOrLowerThanKeyword: .keyword(
6060
kind.keyword,
6161
leadingTrivia: [.newlines(1), .spaces(indentation)]
6262
),

‎Sources/SwiftParser/Declarations.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2013,7 +2013,7 @@ extension Parser {
20132013
elements.append(
20142014
.precedenceGroupRelation(
20152015
RawPrecedenceGroupRelationSyntax(
2016-
higherThanOrLowerThan: level,
2016+
higherThanOrLowerThanKeyword: level,
20172017
unexpectedBeforeColon,
20182018
colon: colon,
20192019
otherNames: RawPrecedenceGroupNameListSyntax(elements: names, arena: self.arena),

‎Sources/SwiftSyntax/SwiftSyntaxCompatibility.swift

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,64 @@ public extension NamedOpaqueReturnTypeSyntax {
554554
}
555555
}
556556

557+
public extension PrecedenceGroupRelationSyntax {
558+
@available(*, deprecated, renamed: "unexpectedBeforeHigherThanOrLowerThanKeyword")
559+
var unexpectedBeforeHigherThanOrLowerThan: UnexpectedNodesSyntax? {
560+
get {
561+
return unexpectedBeforeHigherThanOrLowerThanKeyword
562+
}
563+
set(value) {
564+
unexpectedBeforeHigherThanOrLowerThanKeyword = value
565+
}
566+
}
567+
568+
@available(*, deprecated, renamed: "higherThanOrLowerThanKeyword")
569+
var higherThanOrLowerThan: TokenSyntax {
570+
get {
571+
return higherThanOrLowerThanKeyword
572+
}
573+
set(value) {
574+
higherThanOrLowerThanKeyword = value
575+
}
576+
}
577+
578+
@available(*, deprecated, renamed: "unexpectedBetweenHigherThanOrLowerThanKeywordAndColon")
579+
var unexpectedBetweenHigherThanOrLowerThanAndColon: UnexpectedNodesSyntax? {
580+
get {
581+
return unexpectedBetweenHigherThanOrLowerThanKeywordAndColon
582+
}
583+
set(value) {
584+
unexpectedBetweenHigherThanOrLowerThanKeywordAndColon = value
585+
}
586+
}
587+
588+
@available(*, deprecated, message: "Use an initializer with a genericParameterClause argument.")
589+
@_disfavoredOverload
590+
init(
591+
leadingTrivia: Trivia? = nil,
592+
_ unexpectedBeforeHigherThanOrLowerThan: UnexpectedNodesSyntax? = nil,
593+
higherThanOrLowerThan: TokenSyntax,
594+
_ unexpectedBetweenHigherThanOrLowerThanAndColon: UnexpectedNodesSyntax? = nil,
595+
colon: TokenSyntax = .colonToken(),
596+
_ unexpectedBetweenColonAndOtherNames: UnexpectedNodesSyntax? = nil,
597+
otherNames: PrecedenceGroupNameListSyntax,
598+
_ unexpectedAfterOtherNames: UnexpectedNodesSyntax? = nil,
599+
trailingTrivia: Trivia? = nil
600+
) {
601+
self.init(
602+
leadingTrivia: leadingTrivia,
603+
unexpectedBeforeHigherThanOrLowerThan,
604+
higherThanOrLowerThanKeyword: higherThanOrLowerThan,
605+
unexpectedBetweenHigherThanOrLowerThanAndColon,
606+
colon: colon,
607+
unexpectedBetweenColonAndOtherNames,
608+
otherNames: otherNames,
609+
unexpectedAfterOtherNames,
610+
trailingTrivia: trailingTrivia
611+
)
612+
}
613+
}
614+
557615
public extension SyntaxProtocol {
558616
@available(*, deprecated, message: "Use detached computed property instead.")
559617
func detach() -> Self {

‎Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2643,12 +2643,12 @@ public func childName(_ keyPath: AnyKeyPath) -> String? {
26432643
return "trailingComma"
26442644
case \PrecedenceGroupNameElementSyntax.unexpectedAfterTrailingComma:
26452645
return "unexpectedAfterTrailingComma"
2646-
case \PrecedenceGroupRelationSyntax.unexpectedBeforeHigherThanOrLowerThan:
2647-
return "unexpectedBeforeHigherThanOrLowerThan"
2648-
case \PrecedenceGroupRelationSyntax.higherThanOrLowerThan:
2649-
return "higherThanOrLowerThan"
2650-
case \PrecedenceGroupRelationSyntax.unexpectedBetweenHigherThanOrLowerThanAndColon:
2651-
return "unexpectedBetweenHigherThanOrLowerThanAndColon"
2646+
case \PrecedenceGroupRelationSyntax.unexpectedBeforeHigherThanOrLowerThanKeyword:
2647+
return "unexpectedBeforeHigherThanOrLowerThanKeyword"
2648+
case \PrecedenceGroupRelationSyntax.higherThanOrLowerThanKeyword:
2649+
return "higherThanOrLowerThanKeyword"
2650+
case \PrecedenceGroupRelationSyntax.unexpectedBetweenHigherThanOrLowerThanKeywordAndColon:
2651+
return "unexpectedBetweenHigherThanOrLowerThanKeywordAndColon"
26522652
case \PrecedenceGroupRelationSyntax.colon:
26532653
return "colon"
26542654
case \PrecedenceGroupRelationSyntax.unexpectedBetweenColonAndOtherNames:

‎Sources/SwiftSyntax/generated/raw/RawSyntaxNodes.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17468,9 +17468,9 @@ public struct RawPrecedenceGroupRelationSyntax: RawSyntaxNodeProtocol {
1746817468
}
1746917469

1747017470
public init(
17471-
_ unexpectedBeforeHigherThanOrLowerThan: RawUnexpectedNodesSyntax? = nil,
17472-
higherThanOrLowerThan: RawTokenSyntax,
17473-
_ unexpectedBetweenHigherThanOrLowerThanAndColon: RawUnexpectedNodesSyntax? = nil,
17471+
_ unexpectedBeforeHigherThanOrLowerThanKeyword: RawUnexpectedNodesSyntax? = nil,
17472+
higherThanOrLowerThanKeyword: RawTokenSyntax,
17473+
_ unexpectedBetweenHigherThanOrLowerThanKeywordAndColon: RawUnexpectedNodesSyntax? = nil,
1747417474
colon: RawTokenSyntax,
1747517475
_ unexpectedBetweenColonAndOtherNames: RawUnexpectedNodesSyntax? = nil,
1747617476
otherNames: RawPrecedenceGroupNameListSyntax,
@@ -17480,9 +17480,9 @@ public struct RawPrecedenceGroupRelationSyntax: RawSyntaxNodeProtocol {
1748017480
let raw = RawSyntax.makeLayout(
1748117481
kind: .precedenceGroupRelation, uninitializedCount: 7, arena: arena) { layout in
1748217482
layout.initialize(repeating: nil)
17483-
layout[0] = unexpectedBeforeHigherThanOrLowerThan?.raw
17484-
layout[1] = higherThanOrLowerThan.raw
17485-
layout[2] = unexpectedBetweenHigherThanOrLowerThanAndColon?.raw
17483+
layout[0] = unexpectedBeforeHigherThanOrLowerThanKeyword?.raw
17484+
layout[1] = higherThanOrLowerThanKeyword.raw
17485+
layout[2] = unexpectedBetweenHigherThanOrLowerThanKeywordAndColon?.raw
1748617486
layout[3] = colon.raw
1748717487
layout[4] = unexpectedBetweenColonAndOtherNames?.raw
1748817488
layout[5] = otherNames.raw
@@ -17491,15 +17491,15 @@ public struct RawPrecedenceGroupRelationSyntax: RawSyntaxNodeProtocol {
1749117491
self.init(unchecked: raw)
1749217492
}
1749317493

17494-
public var unexpectedBeforeHigherThanOrLowerThan: RawUnexpectedNodesSyntax? {
17494+
public var unexpectedBeforeHigherThanOrLowerThanKeyword: RawUnexpectedNodesSyntax? {
1749517495
layoutView.children[0].map(RawUnexpectedNodesSyntax.init(raw:))
1749617496
}
1749717497

17498-
public var higherThanOrLowerThan: RawTokenSyntax {
17498+
public var higherThanOrLowerThanKeyword: RawTokenSyntax {
1749917499
layoutView.children[1].map(RawTokenSyntax.init(raw:))!
1750017500
}
1750117501

17502-
public var unexpectedBetweenHigherThanOrLowerThanAndColon: RawUnexpectedNodesSyntax? {
17502+
public var unexpectedBetweenHigherThanOrLowerThanKeywordAndColon: RawUnexpectedNodesSyntax? {
1750317503
layoutView.children[2].map(RawUnexpectedNodesSyntax.init(raw:))
1750417504
}
1750517505

‎Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodes.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14625,9 +14625,9 @@ public struct PrecedenceGroupRelationSyntax: SyntaxProtocol, SyntaxHashable {
1462514625

1462614626
public init(
1462714627
leadingTrivia: Trivia? = nil,
14628-
_ unexpectedBeforeHigherThanOrLowerThan: UnexpectedNodesSyntax? = nil,
14629-
higherThanOrLowerThan: TokenSyntax,
14630-
_ unexpectedBetweenHigherThanOrLowerThanAndColon: UnexpectedNodesSyntax? = nil,
14628+
_ unexpectedBeforeHigherThanOrLowerThanKeyword: UnexpectedNodesSyntax? = nil,
14629+
higherThanOrLowerThanKeyword: TokenSyntax,
14630+
_ unexpectedBetweenHigherThanOrLowerThanKeywordAndColon: UnexpectedNodesSyntax? = nil,
1463114631
colon: TokenSyntax = .colonToken(),
1463214632
_ unexpectedBetweenColonAndOtherNames: UnexpectedNodesSyntax? = nil,
1463314633
otherNames: PrecedenceGroupNameListSyntax,
@@ -14638,18 +14638,18 @@ public struct PrecedenceGroupRelationSyntax: SyntaxProtocol, SyntaxHashable {
1463814638
// Extend the lifetime of all parameters so their arenas don't get destroyed
1463914639
// before they can be added as children of the new arena.
1464014640
let data: SyntaxData = withExtendedLifetime((SyntaxArena(), (
14641-
unexpectedBeforeHigherThanOrLowerThan,
14642-
higherThanOrLowerThan,
14643-
unexpectedBetweenHigherThanOrLowerThanAndColon,
14641+
unexpectedBeforeHigherThanOrLowerThanKeyword,
14642+
higherThanOrLowerThanKeyword,
14643+
unexpectedBetweenHigherThanOrLowerThanKeywordAndColon,
1464414644
colon,
1464514645
unexpectedBetweenColonAndOtherNames,
1464614646
otherNames,
1464714647
unexpectedAfterOtherNames
1464814648
))) {(arena, _) in
1464914649
let layout: [RawSyntax?] = [
14650-
unexpectedBeforeHigherThanOrLowerThan?.raw,
14651-
higherThanOrLowerThan.raw,
14652-
unexpectedBetweenHigherThanOrLowerThanAndColon?.raw,
14650+
unexpectedBeforeHigherThanOrLowerThanKeyword?.raw,
14651+
higherThanOrLowerThanKeyword.raw,
14652+
unexpectedBetweenHigherThanOrLowerThanKeywordAndColon?.raw,
1465314653
colon.raw,
1465414654
unexpectedBetweenColonAndOtherNames?.raw,
1465514655
otherNames.raw,
@@ -14668,7 +14668,7 @@ public struct PrecedenceGroupRelationSyntax: SyntaxProtocol, SyntaxHashable {
1466814668
self.init(data)
1466914669
}
1467014670

14671-
public var unexpectedBeforeHigherThanOrLowerThan: UnexpectedNodesSyntax? {
14671+
public var unexpectedBeforeHigherThanOrLowerThanKeyword: UnexpectedNodesSyntax? {
1467214672
get {
1467314673
return data.child(at: 0, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
1467414674
}
@@ -14678,7 +14678,7 @@ public struct PrecedenceGroupRelationSyntax: SyntaxProtocol, SyntaxHashable {
1467814678
}
1467914679

1468014680
/// The relation to specified other precedence groups.
14681-
public var higherThanOrLowerThan: TokenSyntax {
14681+
public var higherThanOrLowerThanKeyword: TokenSyntax {
1468214682
get {
1468314683
return TokenSyntax(data.child(at: 1, parent: Syntax(self))!)
1468414684
}
@@ -14687,7 +14687,7 @@ public struct PrecedenceGroupRelationSyntax: SyntaxProtocol, SyntaxHashable {
1468714687
}
1468814688
}
1468914689

14690-
public var unexpectedBetweenHigherThanOrLowerThanAndColon: UnexpectedNodesSyntax? {
14690+
public var unexpectedBetweenHigherThanOrLowerThanKeywordAndColon: UnexpectedNodesSyntax? {
1469114691
get {
1469214692
return data.child(at: 2, parent: Syntax(self)).map(UnexpectedNodesSyntax.init)
1469314693
}
@@ -14754,9 +14754,9 @@ public struct PrecedenceGroupRelationSyntax: SyntaxProtocol, SyntaxHashable {
1475414754

1475514755
public static var structure: SyntaxNodeStructure {
1475614756
return .layout([
14757-
\Self.unexpectedBeforeHigherThanOrLowerThan,
14758-
\Self.higherThanOrLowerThan,
14759-
\Self.unexpectedBetweenHigherThanOrLowerThanAndColon,
14757+
\Self.unexpectedBeforeHigherThanOrLowerThanKeyword,
14758+
\Self.higherThanOrLowerThanKeyword,
14759+
\Self.unexpectedBetweenHigherThanOrLowerThanKeywordAndColon,
1476014760
\Self.colon,
1476114761
\Self.unexpectedBetweenColonAndOtherNames,
1476214762
\Self.otherNames,

0 commit comments

Comments
 (0)