[AST] Extend ASTNode to support Pattern/TypeLoc

Author: xedin

include/swift/AST/ASTNode.h

@@ -29,15 +29,19 @@ namespace swift {
   class Expr;
   class Stmt;
   class Decl;
+  class Pattern;
+  struct TypeLoc;
   class DeclContext;
   class SourceLoc;
   class SourceRange;
   class ASTWalker;
   enum class ExprKind : uint8_t;
   enum class DeclKind : uint8_t;
+  enum class PatternKind : uint8_t;
   enum class StmtKind;
 
-  struct ASTNode : public llvm::PointerUnion<Expr*, Stmt*, Decl*> {
+  struct ASTNode : public llvm::PointerUnion<Expr *, Stmt *, Decl *, Pattern *,
+                                             TypeLoc *> {
     // Inherit the constructors from PointerUnion.
     using PointerUnion::PointerUnion;
 
@@ -61,6 +65,7 @@ namespace swift {
     FUNC(Stmt)
     FUNC(Expr)
     FUNC(Decl)
+    FUNC(Pattern)
 #undef FUNC
 
     SWIFT_DEBUG_DUMP;

include/swift/AST/Pattern.h

@@ -223,7 +223,8 @@ class alignas(8) Pattern {
   void print(llvm::raw_ostream &OS,
              const PrintOptions &Options = PrintOptions()) const;
   SWIFT_DEBUG_DUMP;
-  
+  void dump(raw_ostream &OS, unsigned Indent = 0) const;
+
   /// walk - This recursively walks the AST rooted at this pattern.
   Pattern *walk(ASTWalker &walker);
   Pattern *walk(ASTWalker &&walker) { return walk(walker); }  

lib/AST/ASTDumper.cpp

@@ -1426,8 +1426,12 @@ void SourceFile::dump(llvm::raw_ostream &OS) const {
 }
 
 void Pattern::dump() const {
-  PrintPattern(llvm::errs()).visit(const_cast<Pattern*>(this));
-  llvm::errs() << '\n';
+  dump(llvm::errs());
+}
+
+void Pattern::dump(raw_ostream &OS, unsigned Indent) const {
+  PrintPattern(OS, Indent).visit(const_cast<Pattern*>(this));
+  OS << '\n';
 }
 
 //===----------------------------------------------------------------------===//

lib/AST/ASTNode.cpp

@@ -18,6 +18,8 @@
 #include "swift/AST/Decl.h"
 #include "swift/AST/Expr.h"
 #include "swift/AST/Stmt.h"
+#include "swift/AST/Pattern.h"
+#include "swift/AST/TypeLoc.h"
 #include "swift/Basic/SourceLoc.h"
 
 using namespace swift;
@@ -29,6 +31,10 @@ SourceRange ASTNode::getSourceRange() const {
     return S->getSourceRange();
   if (const auto *D = this->dyn_cast<Decl*>())
     return D->getSourceRange();
+  if (const auto *P = this->dyn_cast<Pattern*>())
+    return P->getSourceRange();
+  if (const auto *L = this->dyn_cast<TypeLoc *>())
+    return L->getSourceRange();
   llvm_unreachable("unsupported AST node");
 }
 
@@ -63,6 +69,10 @@ bool ASTNode::isImplicit() const {
     return S->isImplicit();
   if (const auto *D = this->dyn_cast<Decl*>())
     return D->isImplicit();
+  if (const auto *P = this->dyn_cast<Pattern*>())
+    return P->isImplicit();
+  if (const auto *L = this->dyn_cast<TypeLoc*>())
+    return false;
   llvm_unreachable("unsupported AST node");
 }
 
@@ -73,6 +83,8 @@ void ASTNode::walk(ASTWalker &Walker) {
     S->walk(Walker);
   else if (auto *D = this->dyn_cast<Decl*>())
     D->walk(Walker);
+  else if (auto *P = this->dyn_cast<Pattern*>())
+    P->walk(Walker);
   else
     llvm_unreachable("unsupported AST node");
 }
@@ -84,6 +96,8 @@ void ASTNode::dump(raw_ostream &OS, unsigned Indent) const {
     E->dump(OS, Indent);
   else if (auto D = dyn_cast<Decl*>())
     D->dump(OS, Indent);
+  else if (auto P = dyn_cast<Pattern*>())
+    P->dump(OS, Indent);
   else
     OS << "<null>";
 }
@@ -101,4 +115,5 @@ bool ASTNode::is##T(T##Kind Kind) const {                                     \
 FUNC(Stmt)
 FUNC(Expr)
 FUNC(Decl)
+FUNC(Pattern)
 #undef FUNC