Merge pull request #38611 from slavapestov/the-great-renaming

RequirementMachine: The great renaming

Author: slavapestov

include/swift/AST/ASTContext.h

@@ -112,7 +112,6 @@ namespace swift {
   class TupleTypeElt;
   class EnumElementDecl;
   class ProtocolDecl;
-  class RequirementMachine;
   class SubstitutableType;
   class SourceManager;
   class ValueDecl;
@@ -135,6 +134,10 @@ namespace namelookup {
   class ImportCache;
 }
 
+namespace rewriting {
+  class RequirementMachine;
+}
+
 namespace syntax {
   class SyntaxArena;
 }
@@ -1160,7 +1163,7 @@ class ASTContext final {
 
   /// Retrieve or create a term rewriting system for answering queries on
   /// type parameters written against the given generic signature.
-  RequirementMachine *getOrCreateRequirementMachine(
+  rewriting::RequirementMachine *getOrCreateRequirementMachine(
       CanGenericSignature sig);
 
   /// Retrieve a generic signature with a single unconstrained type parameter,

include/swift/AST/GenericSignature.h

@@ -33,10 +33,13 @@ namespace swift {
 class GenericSignatureBuilder;
 class ProtocolConformanceRef;
 class ProtocolType;
-class RequirementMachine;
 class SubstitutionMap;
 class GenericEnvironment;
 
+namespace rewriting {
+  class RequirementMachine;
+}
+
 /// An access path used to find a particular protocol conformance within
 /// a generic signature.
 ///
@@ -82,7 +85,7 @@ class ConformanceAccessPath {
 
   friend class GenericSignatureImpl;
   friend class GenericSignatureBuilder;
-  friend class RequirementMachine;
+  friend class rewriting::RequirementMachine;
 
 public:
   typedef const Entry *const_iterator;
@@ -320,7 +323,7 @@ class alignas(1 << TypeAlignInBits) GenericSignatureImpl final
   GenericSignatureBuilder *getGenericSignatureBuilder() const;
 
   /// Retrieve the requirement machine for the given generic signature.
-  RequirementMachine *getRequirementMachine() const;
+  rewriting::RequirementMachine *getRequirementMachine() const;
 
   /// Collects a set of requirements on a type parameter. Used by
   /// GenericEnvironment for building archetypes.

lib/AST/ASTContext.cpp

@@ -41,7 +41,6 @@
 #include "swift/AST/PropertyWrappers.h"
 #include "swift/AST/ProtocolConformance.h"
 #include "swift/AST/RawComment.h"
-#include "swift/AST/RequirementMachine.h"
 #include "swift/AST/SILLayout.h"
 #include "swift/AST/SemanticAttrs.h"
 #include "swift/AST/SourceFile.h"
@@ -67,6 +66,7 @@
 #include <algorithm>
 #include <memory>
 
+#include "RequirementMachine/RequirementMachine.h"
 #include "RequirementMachine/RewriteContext.h"
 
 using namespace swift;
@@ -420,7 +420,8 @@ struct ASTContext::Implementation {
       GenericSignatureBuilders;
 
     /// Stored requirement machines for canonical generic signatures.
-    llvm::DenseMap<GenericSignature, std::unique_ptr<RequirementMachine>>
+    llvm::DenseMap<GenericSignature,
+                   std::unique_ptr<rewriting::RequirementMachine>>
       RequirementMachines;
 
     /// The set of function types.
@@ -1892,8 +1893,8 @@ GenericSignatureBuilder *ASTContext::getOrCreateGenericSignatureBuilder(
   return builder;
 }
 
-RequirementMachine *ASTContext::getOrCreateRequirementMachine(
-    CanGenericSignature sig) {
+rewriting::RequirementMachine *
+ASTContext::getOrCreateRequirementMachine(CanGenericSignature sig) {
   assert(!sig.hasTypeVariable());
 
   auto &rewriteCtx = getImpl().TheRewriteContext;
@@ -1917,7 +1918,7 @@ RequirementMachine *ASTContext::getOrCreateRequirementMachine(
     return machine;
   }
 
-  auto *machine = new RequirementMachine(*rewriteCtx);
+  auto *machine = new rewriting::RequirementMachine(*rewriteCtx);
 
   // Store this requirement machine before adding the signature,
   // to catch re-entrant construction via addGenericSignature()

lib/AST/CMakeLists.txt

@@ -73,8 +73,8 @@ add_swift_host_library(swiftAST STATIC
   ProtocolConformance.cpp
   RawComment.cpp
   RequirementEnvironment.cpp
-  RequirementMachine/EquivalenceClassMap.cpp
   RequirementMachine/GenericSignatureQueries.cpp
+  RequirementMachine/PropertyMap.cpp
   RequirementMachine/ProtocolGraph.cpp
   RequirementMachine/RequirementMachine.cpp
   RequirementMachine/RewriteContext.cpp

lib/AST/GenericSignature.cpp

@@ -22,9 +22,9 @@
 #include "swift/AST/GenericEnvironment.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/PrettyStackTrace.h"
-#include "swift/AST/RequirementMachine.h"
 #include "swift/AST/Types.h"
 #include "swift/Basic/STLExtras.h"
+#include "RequirementMachine/RequirementMachine.h"
 #include <functional>
 
 using namespace swift;
@@ -191,7 +191,7 @@ GenericSignatureImpl::getGenericSignatureBuilder() const {
                                              CanGenericSignature(this));
 }
 
-RequirementMachine *
+rewriting::RequirementMachine *
 GenericSignatureImpl::getRequirementMachine() const {
   // The requirement machine is associated with the canonical signature.
   if (!isCanonical())