averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consistently get extensions from swift/Basic/FileTypes.h (part 2)

Browse Source 
Remove the last few literal extension strings from Strings.h in favor
of the file_types APIs, and use those APIs in a few more places.
This commit is contained in:
Jordan Rose
2018-07-25 21:12:43 -07:00
parent 67a6a4ff18
commit 97b152d71e
8 changed files with 51 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Serialization/SerializedModuleLoader.cpp
View File

@@ -12,10 +12,10 @@
#include "swift/Serialization/SerializedModuleLoader.h"
#include "swift/Serialization/ModuleFile.h"
#include "swift/Strings.h"
#include "swift/AST/ASTContext.h"
#include "swift/AST/DiagnosticsSema.h"
#include "swift/Basic/Defer.h"
#include "swift/Basic/FileTypes.h"
#include "swift/Basic/STLExtras.h"
#include "swift/Basic/SourceManager.h"
#include "swift/Basic/Version.h"
@@ -106,8 +106,8 @@ static void addDiagnosticInfoForArchitectureMismatch(ASTContext &ctx,
auto entry = *directoryIterator;
StringRef filePath(entry.path());
StringRef extension = llvm::sys::path::extension(filePath);
if (extension.startswith(".") &&
extension.drop_front() == SERIALIZED_MODULE_EXTENSION) {
if (file_types::lookupTypeForExtension(extension) ==
file_types::TY_SwiftModuleFile) {
foundArchs = foundArchs + (foundArchs.length() > 0 ? ", " : "") +
llvm::sys::path::stem(filePath).str();
}
@@ -125,11 +125,12 @@ findModule(ASTContext &ctx, AccessPathElem moduleID,
llvm::SmallString<64> moduleName(moduleID.first.str());
llvm::SmallString<64> moduleFilename(moduleName);
moduleFilename += '.';
moduleFilename += SERIALIZED_MODULE_EXTENSION;
moduleFilename += file_types::getExtension(file_types::TY_SwiftModuleFile);
llvm::SmallString<64> moduleDocFilename(moduleID.first.str());
moduleDocFilename += '.';
moduleDocFilename += SERIALIZED_MODULE_DOC_EXTENSION;
moduleDocFilename +=
file_types::getExtension(file_types::TY_SwiftModuleDocFile);
// FIXME: Which name should we be using here? Do we care about CPU subtypes?
// FIXME: At the very least, don't hardcode "arch".
@@ -139,10 +140,10 @@ findModule(ASTContext &ctx, AccessPathElem moduleID,
llvm::SmallString<16> archDocFile{archName};
if (!archFile.empty()) {
archFile += '.';
archFile += SERIALIZED_MODULE_EXTENSION;
archFile += file_types::getExtension(file_types::TY_SwiftModuleFile);
archDocFile += '.';
archDocFile += SERIALIZED_MODULE_DOC_EXTENSION;
archDocFile += file_types::getExtension(file_types::TY_SwiftModuleDocFile);
}
llvm::SmallString<128> scratch;