AST: Don't include Token.h from Module.h

Author: slavapestov

include/swift/AST/Module.h

@@ -27,7 +27,6 @@
 #include "swift/Basic/OptionSet.h"
 #include "swift/Basic/SourceLoc.h"
 #include "swift/Basic/STLExtras.h"
-#include "swift/Parse/Token.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/SetVector.h"
@@ -72,6 +71,7 @@ namespace swift {
   class ProtocolDecl;
   struct PrintOptions;
   class ReferencedNameTracker;
+  class Token;
   class TupleType;
   class Type;
   class TypeRefinementContext;
@@ -1076,19 +1076,11 @@ class SourceFile final : public FileUnit {
     out << str << '\n';
   }
 
-  std::vector<Token> &getTokenVector() {
-    assert(shouldKeepTokens() && "Disabled");
-    return *AllCorrectedTokens;
-  }
+  std::vector<Token> &getTokenVector();
 
-  ArrayRef<Token> getAllTokens() const {
-    assert(shouldKeepTokens() && "Disabled");
-    return *AllCorrectedTokens;
-  }
+  ArrayRef<Token> getAllTokens() const;
 
-  bool shouldKeepTokens() const {
-    return (bool)AllCorrectedTokens;
-  }
+  bool shouldKeepTokens() const;
 
   syntax::SourceFileSyntax getSyntaxRoot() const;
 

lib/AST/Module.cpp

@@ -34,6 +34,7 @@
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/Basic/Compiler.h"
 #include "swift/Basic/SourceManager.h"
+#include "swift/Parse/Token.h"
 #include "swift/Syntax/SyntaxNodes.h"
 #include "swift/Syntax/SyntaxParsingContext.h"
 #include "clang/Basic/Module.h"
@@ -1364,6 +1365,20 @@ SourceFile::SourceFile(ModuleDecl &M, SourceFileKind K,
 
 SourceFile::~SourceFile() { delete &SyntaxInfo; }
 
+std::vector<Token> &SourceFile::getTokenVector() {
+  assert(shouldKeepTokens() && "Disabled");
+  return *AllCorrectedTokens;
+}
+
+ArrayRef<Token> SourceFile::getAllTokens() const {
+  assert(shouldKeepTokens() && "Disabled");
+  return *AllCorrectedTokens;
+}
+
+bool SourceFile::shouldKeepTokens() const {
+  return (bool)AllCorrectedTokens;
+}
+
 bool FileUnit::walk(ASTWalker &walker) {
   SmallVector<Decl *, 64> Decls;
   getTopLevelDecls(Decls);