Merge pull request #62145 from CodaFi/synfonia

Delete libSyntax

Author: CodaFi

include/swift/AST/ASTContext.h

@@ -144,10 +144,6 @@ namespace rewriting {
   class RewriteContext;
 }
 
-namespace syntax {
-  class SyntaxArena;
-}
-
 namespace ide {
   class TypeCheckCompletionCallback;
 }
@@ -498,9 +494,6 @@ class ASTContext final {
                               setVector.size());
   }
 
-  /// Retrieve the syntax node memory manager for this context.
-  llvm::IntrusiveRefCntPtr<syntax::SyntaxArena> getSyntaxArena() const;
-
   /// Set a new stats reporter.
   void setStatsReporter(UnifiedStatsReporter *stats);
 

include/swift/AST/CMakeLists.txt

@@ -5,7 +5,8 @@ else()
 endif()
 
 set(generated_include_sources
-    Attr.def.gyb)
+    Attr.def.gyb
+    TokenKinds.def.gyb)
 
 add_gyb_target(swift-ast-generated-headers
     "${generated_include_sources}")

include/swift/AST/Decl.h

@@ -6769,8 +6769,7 @@ class AbstractFunctionDecl : public GenericContext, public ValueDecl {
     // FIXME: Remove 'Parsed' from this list once we can always delay
     //        parsing bodies. The -experimental-skip-*-function-bodies options
     //        do currently skip parsing, unless disabled through other means in
-    //        SourceFile::hasDelayedBodyParsing (eg. needing to build the full
-    //        syntax tree due to -verify-syntax-tree).
+    //        SourceFile::hasDelayedBodyParsing.
     assert(getBodyKind() == BodyKind::None ||
            getBodyKind() == BodyKind::Unparsed ||
            getBodyKind() == BodyKind::Parsed);

include/swift/AST/Expr.h

@@ -1108,7 +1108,7 @@ class ObjectLiteralExpr final : public LiteralExpr {
   /// The kind of object literal.
   enum LiteralKind : unsigned {
 #define POUND_OBJECT_LITERAL(Name, Desc, Proto) Name,
-#include "swift/Syntax/TokenKinds.def"
+#include "swift/AST/TokenKinds.def"
   };
 
 private:

include/swift/AST/Module.h

@@ -75,13 +75,9 @@ namespace swift {
   class ValueDecl;
   class VarDecl;
   class VisibleDeclConsumer;
-  class SyntaxParsingCache;
   class ASTScope;
   class SourceLookupCache;
 
-  namespace syntax {
-  class SourceFileSyntax;
-}
 namespace ast_scope {
 class ASTSourceFileScope;
 }

include/swift/AST/ParseRequests.h

@@ -21,7 +21,6 @@
 #include "swift/AST/SimpleRequest.h"
 #include "swift/Basic/Fingerprint.h"
 #include "swift/Parse/Token.h"
-#include "swift/Syntax/SyntaxNodes.h"
 
 namespace swift {
 
@@ -90,7 +89,6 @@ struct SourceFileParsingResult {
   ArrayRef<ASTNode> TopLevelItems;
   Optional<ArrayRef<Token>> CollectedTokens;
   Optional<StableHasher> InterfaceHasher;
-  Optional<syntax::SourceFileSyntax> SyntaxRoot;
 };
 
 /// Parse the top-level items of a SourceFile.

include/swift/AST/SourceFile.h

@@ -78,18 +78,15 @@ class SourceFile final : public FileUnit {
     /// and the associated language option.
     DisablePoundIfEvaluation = 1 << 1,
 
-    /// Whether to build a syntax tree.
-    BuildSyntaxTree = 1 << 2,
-
     /// Whether to save the file's parsed tokens.
-    CollectParsedTokens = 1 << 3,
+    CollectParsedTokens = 1 << 2,
 
     /// Whether to compute the interface hash of the file.
-    EnableInterfaceHash = 1 << 4,
+    EnableInterfaceHash = 1 << 3,
 
     /// Whether to suppress warnings when parsing. This is set for secondary
     /// files, as they get parsed multiple times.
-    SuppressWarnings = 1 << 5,
+    SuppressWarnings = 1 << 4,
   };
   using ParsingOptions = OptionSet<ParsingFlags>;
 
@@ -248,10 +245,6 @@ class SourceFile final : public FileUnit {
   /// code for it. Note this method returns \c false in WMO.
   bool isPrimary() const { return IsPrimary; }
 
-  /// A cache of syntax nodes that can be reused when creating the syntax tree
-  /// for this file.
-  swift::SyntaxParsingCache *SyntaxParsingCache = nullptr;
-
   /// The list of local type declarations in the source file.
   llvm::SetVector<TypeDecl *> LocalTypeDecls;
 
@@ -633,14 +626,10 @@ class SourceFile final : public FileUnit {
   /// them to be accessed from \c getAllTokens.
   bool shouldCollectTokens() const;
 
-  bool shouldBuildSyntaxTree() const;
-
   /// Whether the bodies of types and functions within this file can be lazily
   /// parsed.
   bool hasDelayedBodyParsing() const;
 
-  syntax::SourceFileSyntax getSyntaxRoot() const;
-
   OpaqueTypeDecl *lookupOpaqueResultType(StringRef MangledName) override;
 
   /// Do not call when inside an inactive clause (\c
@@ -660,9 +649,6 @@ class SourceFile final : public FileUnit {
   /// If not \c None, the underlying vector contains the parsed tokens of this
   /// source file.
   Optional<ArrayRef<Token>> AllCollectedTokens;
-
-  /// The root of the syntax tree representing the source file.
-  std::unique_ptr<syntax::SourceFileSyntax> SyntaxRoot;
 };
 
 inline SourceFile::ParsingOptions operator|(SourceFile::ParsingFlags lhs,

include/swift/Syntax/TokenKinds.def.gyb renamed to include/swift/AST/TokenKinds.def.gyb

@@ -420,19 +420,6 @@ namespace swift {
     /// Whether collect tokens during parsing for syntax coloring.
     bool CollectParsedToken = false;
 
-    /// Whether to parse syntax tree. If the syntax tree is built, the generated
-    /// AST may not be correct when syntax nodes are reused as part of
-    /// incrementals parsing.
-    bool BuildSyntaxTree = false;
-
-    /// Whether parsing is occurring for creation of syntax tree only, and no typechecking will occur after
-    /// parsing e.g. when parsing for SwiftSyntax. This is intended to affect parsing, e.g. disable
-    /// unnecessary name lookups that are not useful for pure syntactic parsing.
-    bool ParseForSyntaxTreeOnly = false;
-
-    /// Whether to verify the parsed syntax tree and emit related diagnostics.
-    bool VerifySyntaxTree = false;
-
     /// Whether to disable the evaluation of '#if' decls, such that the bodies
     /// of active clauses aren't hoisted into the enclosing scope.
     bool DisablePoundIfEvaluation = false;

include/swift/Basic/LangOptions.h

@@ -9,7 +9,5 @@ if(SWIFT_INCLUDE_TOOLS)
                 ESCAPE_QUOTES @ONLY)
   add_subdirectory(AST)
   add_subdirectory(Option)
-  add_subdirectory(Parse)
-  add_subdirectory(Syntax)
 endif()