Rename FoundationSoil to FoundationBase.

Author: millenomi

include/swift/AST/KnownIdentifiers.def

@@ -60,8 +60,8 @@ IDENTIFIER(errorDomain)
 IDENTIFIER(forKeyedSubscript)
 IDENTIFIER(Foundation)
 IDENTIFIER(SwiftFoundation)
-IDENTIFIER(FoundationSoil)
-IDENTIFIER(SwiftFoundationSoil)
+IDENTIFIER(FoundationBase)
+IDENTIFIER(SwiftFoundationBase)
 IDENTIFIER(for)
 IDENTIFIER(forKey)
 IDENTIFIER(from)

include/swift/SIL/BridgedTypes.def

@@ -42,11 +42,11 @@
 #define BRIDGE_TYPE(bmodule, btype, nmodule, ntype, opt)
 #endif
 
-BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationSoil, SwiftFoundation, FoundationSoil, Foundation, NSString)
-BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationSoil, SwiftFoundation, FoundationSoil, Foundation, NSArray)
-BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationSoil, SwiftFoundation, FoundationSoil, Foundation, NSDictionary)
-BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationSoil, SwiftFoundation, FoundationSoil, Foundation, NSSet)
-BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationSoil, SwiftFoundation, FoundationSoil, Foundation, NSError)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationBase, SwiftFoundation, FoundationBase, Foundation, NSString)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationBase, SwiftFoundation, FoundationBase, Foundation, NSArray)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationBase, SwiftFoundation, FoundationBase, Foundation, NSDictionary)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationBase, SwiftFoundation, FoundationBase, Foundation, NSSet)
+BRIDGING_KNOWN_TYPE_WITH_MODULES_4(SwiftFoundationBase, SwiftFoundation, FoundationBase, Foundation, NSError)
 BRIDGING_KNOWN_TYPE(Swift, String)
 BRIDGING_KNOWN_TYPE(ObjectiveC, ObjCBool)
 BRIDGING_KNOWN_TYPE(ObjectiveC, Selector)

lib/AST/ASTContext.cpp

@@ -848,12 +848,12 @@ StructDecl *ASTContext::getObjCBoolDecl() const {
 #define GET_FOUNDATION_DECL(NAME) \
 ClassDecl *ASTContext::get##NAME##Decl() const { \
   if (!getImpl().NAME##Decl) { \
-    ModuleDecl *M = getLoadedModule(Id_SwiftFoundationSoil); \
+    ModuleDecl *M = getLoadedModule(Id_SwiftFoundationBase); \
     if (!M) { \
       M = getLoadedModule(Id_SwiftFoundation); \
     } \
     if (!M) { \
-      M = getLoadedModule(Id_FoundationSoil); \
+      M = getLoadedModule(Id_FoundationBase); \
     } \
     if (!M) { \
       M = getLoadedModule(Id_Foundation); \

lib/Sema/CSSimplify.cpp

@@ -3541,9 +3541,9 @@ performMemberLookup(ConstraintKind constraintKind, DeclName memberName,
     LookupResult &bridgedLookup = lookupMember(bridgedType, memberName);
 
     ModuleDecl *foundationModule = nullptr;
-    ModuleDecl *foundationSoilModule = nullptr;
+    ModuleDecl *FoundationBaseModule = nullptr;
     ModuleDecl *swiftFoundationModule = nullptr;
-    ModuleDecl *swiftFoundationSoilModule = nullptr;
+    ModuleDecl *swiftFoundationBaseModule = nullptr;
 
     for (auto result : bridgedLookup) {
       // Ignore results from the Objective-C "Foundation"
@@ -3561,14 +3561,14 @@ performMemberLookup(ConstraintKind constraintKind, DeclName memberName,
         continue;
       }
 
-      if (foundationSoilModule) {
-        if (module == foundationSoilModule)
+      if (FoundationBaseModule) {
+        if (module == FoundationBaseModule)
           continue;
       } else if (ClangModuleUnit::hasClangModule(module) &&
-                 module->getName().str() == "FoundationSoil") {
+                 module->getName().str() == "FoundationBase") {
         // Cache the foundation module name so we don't need to look
         // for it again.
-        foundationSoilModule = module;
+        FoundationBaseModule = module;
         continue;
       }
 
@@ -3583,14 +3583,14 @@ performMemberLookup(ConstraintKind constraintKind, DeclName memberName,
         continue;
       }
 
-      if (swiftFoundationSoilModule) {
-        if (module == swiftFoundationSoilModule)
+      if (swiftFoundationBaseModule) {
+        if (module == swiftFoundationBaseModule)
           continue;
       } else if (ClangModuleUnit::hasClangModule(module) &&
-                 module->getName().str() == "SwiftFoundationSoil") {
+                 module->getName().str() == "SwiftFoundationBase") {
         // Cache the foundation module name so we don't need to look
         // for it again.
-        swiftFoundationSoilModule = module;
+        swiftFoundationBaseModule = module;
         continue;
       }
 

stdlib/public/core/BridgeObjectiveC.swift

@@ -658,7 +658,7 @@ extension Optional: _Unwrappable {
   }
 }
 
-private let _foundationSwiftValueType = _typeByName("FoundationSoil.__SwiftValue") as? _NSSwiftValue.Type
+private let _foundationSwiftValueType = _typeByName("FoundationBase.__SwiftValue") as? _NSSwiftValue.Type
 
 @usableFromInline
 internal var _nullPlaceholder: AnyObject {