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

Renamed swift::types to swift::file_types.

Browse Source
This commit is contained in:
David Ungar
2018-03-17 17:04:12 -07:00
parent 82790fa324
commit 807dd5864e
20 changed files with 572 additions and 567 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/Frontend/OutputFileMap.cpp
View File

@@ -65,12 +65,12 @@ OutputFileMap::getOrCreateOutputMapForSingleOutput() {
}
void OutputFileMap::dump(llvm::raw_ostream &os, bool Sort) const {
typedef std::pair<types::ID, std::string> TypePathPair;
typedef std::pair<file_types::ID, std::string> TypePathPair;
auto printOutputPair = [&os] (StringRef InputPath,
const TypePathPair &OutputPair) -> void {
os << InputPath << " -> " << types::getTypeName(OutputPair.first) << ": \""
<< OutputPair.second << "\"\n";
auto printOutputPair = [&os](StringRef InputPath,
const TypePathPair &OutputPair) -> void {
os << InputPath << " -> " << file_types::getTypeName(OutputPair.first)
<< ": \"" << OutputPair.second << "\"\n";
};
if (Sort) {
@@ -116,9 +116,9 @@ void OutputFileMap::write(llvm::raw_ostream &os,
writeQuotedEscaped(os, input);
os << ":\n";
for (auto &typeAndOutputPath : *outputMap) {
types::ID type = typeAndOutputPath.getFirst();
file_types::ID type = typeAndOutputPath.getFirst();
StringRef output = typeAndOutputPath.getSecond();
os << " " << types::getTypeName(type) << ": ";
os << " " << file_types::getTypeName(type) << ": ";
writeQuotedEscaped(os, output);
os << "\n";
}
@@ -205,16 +205,16 @@ OutputFileMap::parse(std::unique_ptr<llvm::MemoryBuffer> Buffer,
return constructError("path not a scalar node");
llvm::SmallString<16> KindStorage;
types::ID Kind =
types::lookupTypeForName(KindNode->getValue(KindStorage));
file_types::ID Kind =
file_types::lookupTypeForName(KindNode->getValue(KindStorage));
// Ignore unknown types, so that an older swiftc can be used with a newer
// build system.
if (Kind == types::TY_INVALID)
if (Kind == file_types::TY_INVALID)
continue;
llvm::SmallString<128> PathStorage;
OutputMap.insert(std::pair<types::ID, std::string>(
OutputMap.insert(std::pair<file_types::ID, std::string>(
Kind, resolvePath(Path, PathStorage)));
}