[Parse] Remove unnecessary dependencies to Parser.h

include/swift/Frontend/Frontend.h

@@ -39,7 +39,6 @@
 #include "swift/IRGen/TBDGen.h"
 #include "swift/Migrator/MigratorOptions.h"
 #include "swift/Parse/IDEInspectionCallbacks.h"
-#include "swift/Parse/Parser.h"
 #include "swift/Sema/SourceLoader.h"
 #include "swift/Serialization/Validation.h"
 #include "swift/Subsystems.h"
@@ -52,9 +51,9 @@
 #include "llvm/Option/ArgList.h"
 #include "llvm/Support/BLAKE3.h"
 #include "llvm/Support/HashingOutputBackend.h"
-#include "llvm/TargetParser/Host.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/VirtualOutputBackend.h"
+#include "llvm/TargetParser/Host.h"
 
 #include <memory>
 

include/swift/Migrator/FixitFilter.h

@@ -18,6 +18,7 @@
 #define SWIFT_MIGRATOR_FIXITFILTER_H
 
 #include "swift/AST/DiagnosticConsumer.h"
+#include "swift/AST/DiagnosticsParse.h"
 #include "swift/AST/DiagnosticsSema.h"
 
 namespace swift {

include/swift/Parse/ParseDeclName.h

@@ -0,0 +1,100 @@
+//===--- ParseDeclName.h ----------------------------------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2024 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_PARSE_PARSEDECLNAME_H
+#define SWIFT_PARSE_PARSEDECLNAME_H
+
+#include "swift/AST/Identifier.h"
+#include "swift/Basic/LLVM.h"
+#include "swift/Parse/Lexer.h"
+
+namespace swift {
+
+/// Describes a parsed declaration name.
+struct ParsedDeclName {
+  /// The name of the context of which the corresponding entity should
+  /// become a member.
+  StringRef ContextName;
+
+  /// The base name of the declaration.
+  StringRef BaseName;
+
+  /// The argument labels for a function declaration.
+  SmallVector<StringRef, 4> ArgumentLabels;
+
+  /// Whether this is a function name (vs. a value name).
+  bool IsFunctionName = false;
+
+  /// Whether this is a getter for the named property.
+  bool IsGetter = false;
+
+  /// Whether this is a setter for the named property.
+  bool IsSetter = false;
+
+  bool IsSubscript = false;
+
+  /// For a declaration name that makes the declaration into an
+  /// instance member, the index of the "Self" parameter.
+  std::optional<unsigned> SelfIndex;
+
+  /// Determine whether this is a valid name.
+  explicit operator bool() const { return !BaseName.empty(); }
+
+  /// Whether this declaration name turns the declaration into a
+  /// member of some named context.
+  bool isMember() const { return !ContextName.empty(); }
+
+  /// Whether the result is translated into an instance member.
+  bool isInstanceMember() const {
+    return isMember() && static_cast<bool>(SelfIndex);
+  }
+
+  /// Whether the result is translated into a static/class member.
+  bool isClassMember() const {
+    return isMember() && !static_cast<bool>(SelfIndex);
+  }
+
+  /// Whether this is a property accessor.
+  bool isPropertyAccessor() const { return IsGetter || IsSetter; }
+
+  /// Whether this is an operator.
+  bool isOperator() const { return Lexer::isOperator(BaseName); }
+
+  /// Form a declaration name from this parsed declaration name.
+  DeclName formDeclName(ASTContext &ctx, bool isSubscript = false,
+                        bool isCxxClassTemplateSpec = false) const;
+
+  /// Form a declaration name from this parsed declaration name.
+  DeclNameRef formDeclNameRef(ASTContext &ctx, bool isSubscript = false,
+                              bool isCxxClassTemplateSpec = false) const;
+};
+
+/// Parse a stringified Swift declaration name,
+/// e.g. "Foo.translateBy(self:x:y:)".
+ParsedDeclName parseDeclName(StringRef name) LLVM_READONLY;
+
+/// Form a Swift declaration name from its constituent parts.
+DeclName formDeclName(ASTContext &ctx, StringRef baseName,
+                      ArrayRef<StringRef> argumentLabels, bool isFunctionName,
+                      bool isInitializer, bool isSubscript = false,
+                      bool isCxxClassTemplateSpec = false);
+
+/// Form a Swift declaration name reference from its constituent parts.
+DeclNameRef formDeclNameRef(ASTContext &ctx, StringRef baseName,
+                            ArrayRef<StringRef> argumentLabels,
+                            bool isFunctionName, bool isInitializer,
+                            bool isSubscript = false,
+                            bool isCxxClassTemplateSpec = false);
+
+} // namespace swift
+
+#endif // SWIFT_PARSE_PARSEDECLNAME_H

include/swift/Parse/Parser.h

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2024 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -2118,67 +2118,6 @@ class Parser {
   ParserResult<Expr> parseExprFromSyntaxTree();
 };
 
-/// Describes a parsed declaration name.
-struct ParsedDeclName {
-  /// The name of the context of which the corresponding entity should
-  /// become a member.
-  StringRef ContextName;
-
-  /// The base name of the declaration.
-  StringRef BaseName;
-
-  /// The argument labels for a function declaration.
-  SmallVector<StringRef, 4> ArgumentLabels;
-
-  /// Whether this is a function name (vs. a value name).
-  bool IsFunctionName = false;
-
-  /// Whether this is a getter for the named property.
-  bool IsGetter = false;
-
-  /// Whether this is a setter for the named property.
-  bool IsSetter = false;
-
-  bool IsSubscript = false;
-
-  /// For a declaration name that makes the declaration into an
-  /// instance member, the index of the "Self" parameter.
-  std::optional<unsigned> SelfIndex;
-
-  /// Determine whether this is a valid name.
-  explicit operator bool() const { return !BaseName.empty(); }
-
-  /// Whether this declaration name turns the declaration into a
-  /// member of some named context.
-  bool isMember() const { return !ContextName.empty(); }
-
-  /// Whether the result is translated into an instance member.
-  bool isInstanceMember() const {
-    return isMember() && static_cast<bool>(SelfIndex);
-  }
-
-  /// Whether the result is translated into a static/class member.
-  bool isClassMember() const {
-    return isMember() && !static_cast<bool>(SelfIndex);
-  }
-
-  /// Whether this is a property accessor.
-  bool isPropertyAccessor() const { return IsGetter || IsSetter; }
-
-  /// Whether this is an operator.
-  bool isOperator() const {
-    return Lexer::isOperator(BaseName);
-  }
-
-  /// Form a declaration name from this parsed declaration name.
-  DeclName formDeclName(ASTContext &ctx, bool isSubscript = false,
-                        bool isCxxClassTemplateSpec = false) const;
-
-  /// Form a declaration name from this parsed declaration name.
-  DeclNameRef formDeclNameRef(ASTContext &ctx, bool isSubscript = false,
-                              bool isCxxClassTemplateSpec = false) const;
-};
-
 /// To assist debugging parser crashes, tell us the location of the
 /// current token.
 class PrettyStackTraceParser : public llvm::PrettyStackTraceEntry {
@@ -2188,28 +2127,6 @@ class PrettyStackTraceParser : public llvm::PrettyStackTraceEntry {
   void print(llvm::raw_ostream &out) const override;
 };
 
-/// Parse a stringified Swift declaration name,
-/// e.g. "Foo.translateBy(self:x:y:)".
-ParsedDeclName parseDeclName(StringRef name) LLVM_READONLY;
-
-/// Form a Swift declaration name from its constituent parts.
-DeclName formDeclName(ASTContext &ctx,
-                      StringRef baseName,
-                      ArrayRef<StringRef> argumentLabels,
-                      bool isFunctionName,
-                      bool isInitializer,
-                      bool isSubscript = false,
-                      bool isCxxClassTemplateSpec = false);
-
-/// Form a Swift declaration name reference from its constituent parts.
-DeclNameRef formDeclNameRef(ASTContext &ctx,
-                            StringRef baseName,
-                            ArrayRef<StringRef> argumentLabels,
-                            bool isFunctionName,
-                            bool isInitializer,
-                            bool isSubscript = false,
-                            bool isCxxClassTemplateSpec = false);
-
 /// Whether a given token can be the start of a decl.
 bool isKeywordPossibleDeclStart(const LangOptions &options, const Token &Tok);
 

lib/APIDigester/ModuleAnalyzerNodes.cpp

@@ -1,10 +1,11 @@
-#include "llvm/ADT/STLExtras.h"
 #include "swift/AST/ASTMangler.h"
 #include "swift/Basic/Assertions.h"
 #include "swift/Basic/Defer.h"
+#include "swift/Parse/Lexer.h"
 #include "swift/Sema/IDETypeChecking.h"
-#include <swift/APIDigester/ModuleAnalyzerNodes.h>
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
+#include <swift/APIDigester/ModuleAnalyzerNodes.h>
 
 using namespace swift;
 using namespace ide;

lib/AST/AccessNotes.cpp

@@ -16,12 +16,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/AST/AccessNotes.h"
+#include "swift/AST/ASTContext.h"
 #include "swift/AST/Attr.h"
 #include "swift/AST/Decl.h"
-#include "swift/AST/Module.h"     // DeclContext::isModuleScopeContext()
 #include "swift/AST/DiagnosticsFrontend.h"
+#include "swift/AST/Module.h" // DeclContext::isModuleScopeContext()
 #include "swift/Basic/Assertions.h"
-#include "swift/Parse/Parser.h"
+#include "swift/Parse/ParseDeclName.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/YAMLTraits.h"

lib/ClangImporter/ClangImporter.cpp

@@ -47,9 +47,7 @@
 #include "swift/Basic/Version.h"
 #include "swift/ClangImporter/ClangImporterRequests.h"
 #include "swift/ClangImporter/ClangModule.h"
-#include "swift/Parse/Lexer.h"
 #include "swift/Parse/ParseVersion.h"
-#include "swift/Parse/Parser.h"
 #include "swift/Strings.h"
 #include "swift/Subsystems.h"
 #include "clang/AST/ASTContext.h"

lib/ClangImporter/ImportName.cpp

@@ -31,7 +31,7 @@
 #include "swift/Basic/STLExtras.h"
 #include "swift/Basic/StringExtras.h"
 #include "swift/ClangImporter/ClangImporterRequests.h"
-#include "swift/Parse/Parser.h"
+#include "swift/Parse/ParseDeclName.h"
 #include "swift/Strings.h"
 #include "swift/Subsystems.h"
 #include "clang/AST/ASTContext.h"

lib/Frontend/CompilerInvocation.cpp

@@ -18,26 +18,26 @@
 #include "ArgsToFrontendOptionsConverter.h"
 #include "swift/AST/DiagnosticsFrontend.h"
 #include "swift/Basic/Assertions.h"
-#include "swift/Basic/Assertions.h"
 #include "swift/Basic/Feature.h"
 #include "swift/Basic/Platform.h"
 #include "swift/Option/Options.h"
 #include "swift/Option/SanitizerOptions.h"
+#include "swift/Parse/Lexer.h"
 #include "swift/Parse/ParseVersion.h"
 #include "swift/SIL/SILBridging.h"
 #include "swift/Strings.h"
 #include "swift/SymbolGraphGen/SymbolGraphOptions.h"
 #include "llvm/ADT/STLExtras.h"
-#include "llvm/Support/VersionTuple.h"
-#include "llvm/TargetParser/Triple.h"
 #include "llvm/Option/Arg.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Option/Option.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/LineIterator.h"
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Process.h"
+#include "llvm/Support/VersionTuple.h"
 #include "llvm/Support/WithColor.h"
+#include "llvm/TargetParser/Triple.h"
 
 using namespace swift;
 using namespace llvm::opt;

lib/IDE/Formatting.cpp

@@ -14,11 +14,11 @@
 #include "swift/AST/GenericParamList.h"
 #include "swift/AST/TypeRepr.h"
 #include "swift/Basic/Assertions.h"
-#include "swift/IDE/SourceEntityWalker.h"
-#include "swift/Parse/Parser.h"
-#include "swift/Frontend/Frontend.h"
 #include "swift/Basic/SourceManager.h"
+#include "swift/Frontend/Frontend.h"
 #include "swift/IDE/Indenting.h"
+#include "swift/IDE/SourceEntityWalker.h"
+#include "swift/Parse/Lexer.h"
 #include "swift/Subsystems.h"
 
 using namespace swift;

lib/IDE/IDERequests.cpp

@@ -10,21 +10,22 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "swift/IDE/IDERequests.h"
+#include "swift/AST/ASTDemangler.h"
 #include "swift/AST/ASTPrinter.h"
 #include "swift/AST/Decl.h"
 #include "swift/AST/Effects.h"
 #include "swift/AST/NameLookup.h"
-#include "swift/AST/ASTDemangler.h"
 #include "swift/Basic/Assertions.h"
 #include "swift/Basic/SourceManager.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/Frontend/PrintingDiagnosticConsumer.h"
 #include "swift/IDE/CommentConversion.h"
 #include "swift/IDE/Utils.h"
-#include "swift/Sema/IDETypeChecking.h"
 #include "swift/Markup/XMLUtils.h"
+#include "swift/Parse/Lexer.h"
+#include "swift/Sema/IDETypeChecking.h"
 #include "swift/Subsystems.h"
-#include "swift/IDE/IDERequests.h"
 
 using namespace swift;
 using namespace swift::ide;

lib/IDE/REPLCodeCompletion.cpp

@@ -21,11 +21,10 @@
 #include "swift/AST/SourceFile.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/SourceManager.h"
-#include "swift/Parse/Parser.h"
 #include "swift/Subsystems.h"
-#include "llvm/Support/raw_ostream.h"
-#include "llvm/Support/MemoryBuffer.h"
 #include "llvm/ADT/SmallString.h"
+#include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/raw_ostream.h"
 #include <algorithm>
 
 using namespace swift;

lib/Migrator/APIDiffMigratorPass.cpp

@@ -10,26 +10,27 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/AST/USRGeneration.h"
 #include "swift/AST/ASTVisitor.h"
+#include "swift/AST/USRGeneration.h"
 #include "swift/Basic/Assertions.h"
+#include "swift/Basic/Defer.h"
 #include "swift/Basic/StringExtras.h"
 #include "swift/Frontend/Frontend.h"
+#include "swift/IDE/APIDigesterData.h"
 #include "swift/IDE/Utils.h"
-#include "swift/Sema/IDETypeChecking.h"
 #include "swift/Migrator/ASTMigratorPass.h"
 #include "swift/Migrator/EditorAdapter.h"
 #include "swift/Migrator/FixitApplyDiagnosticConsumer.h"
 #include "swift/Migrator/Migrator.h"
 #include "swift/Migrator/RewriteBufferEditsReceiver.h"
+#include "swift/Parse/Lexer.h"
+#include "swift/Sema/IDETypeChecking.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/SourceManager.h"
 #include "clang/Edit/EditedSource.h"
 #include "clang/Rewrite/Core/RewriteBuffer.h"
 #include "llvm/Support/FileSystem.h"
-#include "swift/IDE/APIDigesterData.h"
-#include "swift/Basic/Defer.h"
 
 using namespace swift;
 using namespace swift::migrator;