Merge pull request #173 from ahoppen/remove-is-expr-etc

Remove isExpr etc. methods

Author: ahoppen

Changelog.md

@@ -4,6 +4,10 @@ Note: This is in reverse chronological order, so newer entries are added to the
 
 ## Swift 5.2
 
+- Properties `isExpr`, `isDecl`, `isStmt`, `isType` and `isPattern` removed from `SyntaxNode`
+
+  Use `is(ExprSyntaxProtocol.self)` etc. instead.
+
 - Property `uniqueIdentifier` removed from syntax nodes and `SyntaxNode` ([#164](https://github.com/apple/swift-syntax/pull/164))
 
   Use the newly added property `id` or the conformance to `Identifiable` instead.

Sources/SwiftSyntax/Syntax.swift

@@ -119,36 +119,14 @@ public extension SyntaxProtocol {
     return raw.isToken
   }
 
-  /// Whether or not this node represents an Expression.
-  var isExpr: Bool {
-    return raw.kind.isExpr
-  }
-
   /// Whether or not this node represents an SyntaxCollection.
   var isCollection: Bool {
+    // We need to provide a custom implementation for is(SyntaxCollection.self)
+    // since SyntaxCollection has generic or self requirements and can thus
+    // not be used as a method argument.
     return raw.kind.isSyntaxCollection
   }
 
-  /// Whether or not this node represents a Declaration.
-  var isDecl: Bool {
-    return raw.kind.isDecl
-  }
-
-  /// Whether or not this node represents a Statement.
-  var isStmt: Bool {
-    return raw.kind.isStmt
-  }
-
-  /// Whether or not this node represents a Type.
-  var isType: Bool {
-    return raw.kind.isType
-  }
-
-  /// Whether or not this node represents a Pattern.
-  var isPattern: Bool {
-    return raw.kind.isPattern
-  }
-
   /// Whether or not this node represents an unknown node.
   var isUnknown: Bool {
     return raw.kind.isUnknown

Sources/SwiftSyntax/SyntaxKind.swift.gyb

@@ -1,9 +1,6 @@
 %{
   from gyb_syntax_support import *
   from gyb_syntax_support.kinds import SYNTAX_BASE_KINDS
-  grouped_nodes = { kind: [] for kind in SYNTAX_BASE_KINDS }
-  for node in SYNTAX_NODES:
-    grouped_nodes[node.base_kind].append(node)
   # -*- mode: Swift -*-
   # Ignore the following admonition; it applies to the resulting .swift file only
 }%
@@ -29,23 +26,21 @@ internal enum SyntaxKind: CSyntaxKind {
   case ${node.swift_syntax_kind} = ${SYNTAX_NODE_SERIALIZATION_CODES[node.syntax_kind]}
 % end
 
-% for name, nodes in grouped_nodes.items():
-%   if name not in ["Syntax"]:
-  /// Whether the underlying kind is a sub-kind of ${name}Syntax.
-  var is${name}: Bool {
+  var isSyntaxCollection: Bool {
     switch self {
-%     for node in nodes:
+% for node in SYNTAX_NODES:
+%   if node.base_kind == "SyntaxCollection":
     case .${node.swift_syntax_kind}: return true
-%     end
+%   end
+% end
+    case .unknown: return true
     default: return false
     }
   }
-%   end
-% end
 
   var isUnknown: Bool {
     switch self {
-% for name, nodes in grouped_nodes.items():
+% for name in SYNTAX_BASE_KINDS:
 %   if name not in ["Syntax", "SyntaxCollection"]:
     case .unknown${name}: return true
 %   end

Sources/SwiftSyntax/gyb_generated/SyntaxKind.swift

@@ -243,109 +243,6 @@ internal enum SyntaxKind: CSyntaxKind {
   case availabilityVersionRestriction = 161
   case versionTuple = 162
 
-  /// Whether the underlying kind is a sub-kind of DeclSyntax.
-  var isDecl: Bool {
-    switch self {
-    case .unknownDecl: return true
-    case .typealiasDecl: return true
-    case .associatedtypeDecl: return true
-    case .ifConfigDecl: return true
-    case .poundErrorDecl: return true
-    case .poundWarningDecl: return true
-    case .poundSourceLocation: return true
-    case .classDecl: return true
-    case .structDecl: return true
-    case .protocolDecl: return true
-    case .extensionDecl: return true
-    case .functionDecl: return true
-    case .initializerDecl: return true
-    case .deinitializerDecl: return true
-    case .subscriptDecl: return true
-    case .importDecl: return true
-    case .accessorDecl: return true
-    case .variableDecl: return true
-    case .enumCaseDecl: return true
-    case .enumDecl: return true
-    case .operatorDecl: return true
-    case .precedenceGroupDecl: return true
-    default: return false
-    }
-  }
-  /// Whether the underlying kind is a sub-kind of ExprSyntax.
-  var isExpr: Bool {
-    switch self {
-    case .unknownExpr: return true
-    case .inOutExpr: return true
-    case .poundColumnExpr: return true
-    case .tryExpr: return true
-    case .identifierExpr: return true
-    case .superRefExpr: return true
-    case .nilLiteralExpr: return true
-    case .discardAssignmentExpr: return true
-    case .assignmentExpr: return true
-    case .sequenceExpr: return true
-    case .poundLineExpr: return true
-    case .poundFileExpr: return true
-    case .poundFunctionExpr: return true
-    case .poundDsohandleExpr: return true
-    case .symbolicReferenceExpr: return true
-    case .prefixOperatorExpr: return true
-    case .binaryOperatorExpr: return true
-    case .arrowExpr: return true
-    case .floatLiteralExpr: return true
-    case .tupleExpr: return true
-    case .arrayExpr: return true
-    case .dictionaryExpr: return true
-    case .integerLiteralExpr: return true
-    case .booleanLiteralExpr: return true
-    case .ternaryExpr: return true
-    case .memberAccessExpr: return true
-    case .isExpr: return true
-    case .asExpr: return true
-    case .typeExpr: return true
-    case .closureExpr: return true
-    case .unresolvedPatternExpr: return true
-    case .functionCallExpr: return true
-    case .subscriptExpr: return true
-    case .optionalChainingExpr: return true
-    case .forcedValueExpr: return true
-    case .postfixUnaryExpr: return true
-    case .specializeExpr: return true
-    case .stringLiteralExpr: return true
-    case .keyPathExpr: return true
-    case .keyPathBaseExpr: return true
-    case .objcKeyPathExpr: return true
-    case .objcSelectorExpr: return true
-    case .editorPlaceholderExpr: return true
-    case .objectLiteralExpr: return true
-    default: return false
-    }
-  }
-  /// Whether the underlying kind is a sub-kind of StmtSyntax.
-  var isStmt: Bool {
-    switch self {
-    case .unknownStmt: return true
-    case .continueStmt: return true
-    case .whileStmt: return true
-    case .deferStmt: return true
-    case .expressionStmt: return true
-    case .repeatWhileStmt: return true
-    case .guardStmt: return true
-    case .forInStmt: return true
-    case .switchStmt: return true
-    case .doStmt: return true
-    case .returnStmt: return true
-    case .yieldStmt: return true
-    case .fallthroughStmt: return true
-    case .breakStmt: return true
-    case .declarationStmt: return true
-    case .throwStmt: return true
-    case .ifStmt: return true
-    case .poundAssertStmt: return true
-    default: return false
-    }
-  }
-  /// Whether the underlying kind is a sub-kind of SyntaxCollectionSyntax.
   var isSyntaxCollection: Bool {
     switch self {
     case .codeBlockItemList: return true
@@ -386,42 +283,7 @@ internal enum SyntaxKind: CSyntaxKind {
     case .genericArgumentList: return true
     case .tuplePatternElementList: return true
     case .availabilitySpecList: return true
-    default: return false
-    }
-  }
-  /// Whether the underlying kind is a sub-kind of PatternSyntax.
-  var isPattern: Bool {
-    switch self {
-    case .unknownPattern: return true
-    case .enumCasePattern: return true
-    case .isTypePattern: return true
-    case .optionalPattern: return true
-    case .identifierPattern: return true
-    case .asTypePattern: return true
-    case .tuplePattern: return true
-    case .wildcardPattern: return true
-    case .expressionPattern: return true
-    case .valueBindingPattern: return true
-    default: return false
-    }
-  }
-  /// Whether the underlying kind is a sub-kind of TypeSyntax.
-  var isType: Bool {
-    switch self {
-    case .unknownType: return true
-    case .simpleTypeIdentifier: return true
-    case .memberTypeIdentifier: return true
-    case .classRestrictionType: return true
-    case .arrayType: return true
-    case .dictionaryType: return true
-    case .metatypeType: return true
-    case .optionalType: return true
-    case .someType: return true
-    case .implicitlyUnwrappedOptionalType: return true
-    case .compositionType: return true
-    case .tupleType: return true
-    case .functionType: return true
-    case .attributedType: return true
+    case .unknown: return true
     default: return false
     }
   }
@@ -430,8 +292,8 @@ internal enum SyntaxKind: CSyntaxKind {
     switch self {
     case .unknownDecl: return true
     case .unknownExpr: return true
-    case .unknownStmt: return true
     case .unknownPattern: return true
+    case .unknownStmt: return true
     case .unknownType: return true
     case .unknown: return true
     default: return false