Merge pull request #1983 from ahoppen/ahoppen/renames-again

Some more renames of syntax nodes

Author: ahoppen

CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

@@ -190,7 +190,8 @@ public let ATTRIBUTE_NODES: [Node] = [
     traits: ["WithTrailingComma"],
     children: [
       Child(
-        name: "AvailabilityVersionRestriction",
+        name: "PlatformVersion",
+        deprecatedName: "AvailabilityVersionRestriction",
         kind: .node(kind: .platformVersion)
       ),
       Child(

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -770,7 +770,7 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "Literal",
         deprecatedName: "FloatingDigits",
-        kind: .token(choices: [.token(tokenKind: "FloatingLiteralToken")])
+        kind: .token(choices: [.token(tokenKind: "FloatLiteralToken")])
       )
     ]
   ),
@@ -1384,8 +1384,7 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "Operator",
         deprecatedName: "OperatorToken",
-        kind: .token(choices: [.token(tokenKind: "PrefixOperatorToken")]),
-        isOptional: true
+        kind: .token(choices: [.token(tokenKind: "PrefixOperatorToken")])
       ),
       Child(
         name: "Expression",

CodeGeneration/Sources/SyntaxSupport/TokenSpec.swift

@@ -79,7 +79,7 @@ public let SYNTAX_TOKENS: [TokenSpec] = [
   .other(name: "endOfFile", nameForDiagnostics: "end of file", text: ""),
   .punctuator(name: "equal", text: "="),
   .punctuator(name: "exclamationMark", text: "!"),
-  .other(name: "floatingLiteral", nameForDiagnostics: "floating literal"),
+  .other(name: "floatLiteral", nameForDiagnostics: "float literal"),
   .other(name: "identifier", nameForDiagnostics: "identifier"),
   .punctuator(name: "infixQuestionMark", text: "?"),
   .other(name: "integerLiteral", nameForDiagnostics: "integer literal"),

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

@@ -178,7 +178,7 @@ class ValidateSyntaxNodes: XCTestCase {
         }
       }
 
-    case .token(tokenKind: "IdentifierToken"), .token(tokenKind: "IntegerLiteralToken"), .token(tokenKind: "FloatingLiteralToken"):
+    case .token(tokenKind: "IdentifierToken"), .token(tokenKind: "IntegerLiteralToken"), .token(tokenKind: "FloatLiteralToken"):
       // We allow arbitrary naming of identifiers and literals
       break
     case .token(tokenKind: "CommaToken"):

Sources/SwiftIDEUtils/SyntaxClassification.swift

@@ -28,7 +28,7 @@ public enum SyntaxClassification {
   /// An editor placeholder of the form `<#content#>`
   case editorPlaceholder
   /// A floating point literal.
-  case floatingLiteral
+  case floatLiteral
   /// A generic identifier.
   case identifier
   /// An integer literal.
@@ -51,6 +51,11 @@ public enum SyntaxClassification {
   case stringLiteral
   /// An identifier referring to a type.
   case typeIdentifier
+
+  @available(*, deprecated, renamed: "floatLiteral")
+  public static var floatingLiteral: Self {
+    return .floatLiteral
+  }
 }
 
 extension SyntaxClassification {
@@ -65,7 +70,7 @@ extension SyntaxClassification {
     switch keyPath {
     case \AttributeSyntax.attributeName:
       return (.attribute, true)
-    case \PlatformVersionItemSyntax.availabilityVersionRestriction:
+    case \PlatformVersionItemSyntax.platformVersion:
       return (.keyword, false)
     case \AvailabilityVersionRestrictionSyntax.platform:
       return (.keyword, false)
@@ -124,8 +129,8 @@ extension RawTokenKind {
       return .none
     case .exclamationMark:
       return .none
-    case .floatingLiteral:
-      return .floatingLiteral
+    case .floatLiteral:
+      return .floatLiteral
     case .identifier:
       return .identifier
     case .infixQuestionMark:

Sources/SwiftParser/Attributes.swift

@@ -865,7 +865,7 @@ extension Parser {
       keepGoing = self.consume(if: .comma)
       elements.append(
         RawPlatformVersionItemSyntax(
-          availabilityVersionRestriction: versionRestriction,
+          platformVersion: versionRestriction,
           trailingComma: keepGoing,
           arena: self.arena
         )
@@ -925,7 +925,7 @@ extension Parser {
       keepGoing = self.consume(if: .comma)
       platforms.append(
         RawPlatformVersionItemSyntax(
-          availabilityVersionRestriction: restriction,
+          platformVersion: restriction,
           trailingComma: keepGoing,
           arena: self.arena
         )

Sources/SwiftParser/Availability.swift

@@ -210,7 +210,7 @@ extension Parser {
     }
 
     let version: RawVersionTupleSyntax?
-    if self.at(.integerLiteral, .floatingLiteral) {
+    if self.at(.integerLiteral, .floatLiteral) {
       version = self.parseVersionTuple(maxComponentCount: 3)
     } else {
       version = nil
@@ -237,7 +237,7 @@ extension Parser {
     return self.consumeAnyToken()
   }
 
-  /// Consume the unexpected version token(e.g. integerLiteral, floatingLiteral, identifier) until the period no longer appears.
+  /// Consume the unexpected version token(e.g. integerLiteral, floatLiteral, identifier) until the period no longer appears.
   private mutating func parseUnexpectedVersionTokens() -> RawUnexpectedNodesSyntax? {
     var unexpectedTokens: [RawTokenSyntax] = []
     var keepGoing: RawTokenSyntax? = nil
@@ -246,7 +246,7 @@ extension Parser {
       if let keepGoing {
         unexpectedTokens.append(keepGoing)
       }
-      if let unexpectedVersion = self.consume(if: .integerLiteral, .floatingLiteral, .identifier) {
+      if let unexpectedVersion = self.consume(if: .integerLiteral, .floatLiteral, .identifier) {
         unexpectedTokens.append(unexpectedVersion)
       }
       keepGoing = self.consume(if: .period)
@@ -256,7 +256,7 @@ extension Parser {
 
   /// Parse a dot-separated list of version numbers.
   mutating func parseVersionTuple(maxComponentCount: Int) -> RawVersionTupleSyntax {
-    if self.at(.floatingLiteral),
+    if self.at(.floatLiteral),
       let periodIndex = self.currentToken.tokenText.firstIndex(of: UInt8(ascii: ".")),
       self.currentToken.tokenText[0..<periodIndex].allSatisfy({ Unicode.Scalar($0).isDigit })
     {

Sources/SwiftParser/Expressions.swift

@@ -1097,7 +1097,7 @@ extension Parser {
           arena: self.arena
         )
       )
-    case (.floatingLiteral, let handle)?:
+    case (.floatLiteral, let handle)?:
       let literal = self.eat(handle)
       return RawExprSyntax(
         RawFloatLiteralExprSyntax(
@@ -1186,7 +1186,7 @@ extension Parser {
         return RawExprSyntax(
           RawFloatLiteralExprSyntax(
             literal: RawTokenSyntax(
-              missing: .floatingLiteral,
+              missing: .floatLiteral,
               text: text,
               arena: self.arena
             ),

Sources/SwiftParser/IncrementalParseTransition.swift

@@ -35,7 +35,7 @@ extension Parser {
   }
 }
 
-/// Accepts a re-used ``Syntax`` node that `IncrementalParseTransition`
+/// Accepts a re-used `Syntax` node that `IncrementalParseTransition`
 /// determined they should be re-used for a parse invocation.
 ///
 /// The client can use this information to potentially avoid unnecessary work

Sources/SwiftParser/Lexer/Cursor.swift

@@ -1407,7 +1407,7 @@ extension Lexer.Cursor {
         let errorPos = tmp
         self.advance(while: { $0.isValidIdentifierContinuationCodePoint })
         return Lexer.Result(
-          .floatingLiteral,
+          .floatLiteral,
           error: LexingDiagnostic(errorKind, position: errorPos)
         )
       }
@@ -1419,13 +1419,13 @@ extension Lexer.Cursor {
         let errorPos = tmp
         self.advance(while: { $0.isValidIdentifierContinuationCodePoint })
         return Lexer.Result(
-          .floatingLiteral,
+          .floatLiteral,
           error: LexingDiagnostic(.invalidFloatingPointExponentDigit, position: errorPos)
         )
       }
     }
 
-    return Lexer.Result(.floatingLiteral)
+    return Lexer.Result(.floatLiteral)
   }
 
   mutating func lexHexNumber() -> Lexer.Result {
@@ -1529,7 +1529,7 @@ extension Lexer.Cursor {
       let errorPos = tmp
       self.advance(while: { $0.isValidIdentifierContinuationCodePoint })
       return Lexer.Result(
-        .floatingLiteral,
+        .floatLiteral,
         error: LexingDiagnostic(errorKind, position: errorPos)
       )
     }
@@ -1541,11 +1541,11 @@ extension Lexer.Cursor {
       let errorPos = tmp
       self.advance(while: { $0.isValidIdentifierContinuationCodePoint })
       return Lexer.Result(
-        .floatingLiteral,
+        .floatLiteral,
         error: LexingDiagnostic(.invalidFloatingPointExponentDigit, position: errorPos)
       )
     }
-    return Lexer.Result(.floatingLiteral)
+    return Lexer.Result(.floatLiteral)
   }
 }