Hi tareqsiraj, arielbernal,
File override structures now contain per-source overrides for headers.
For now, modified headers are written to disk when the Migrator is done.
This is only temporary behaviour since we can expect headers to be
changed by migrating multiple source files. The changes need to be
merged after all migrations are complete.
http://llvm-reviews.chandlerc.com/D971
Files:
cpp11-migrate/Core/FileOverrides.cpp
cpp11-migrate/Core/FileOverrides.h
cpp11-migrate/tool/Cpp11Migrate.cpp
Index: cpp11-migrate/Core/FileOverrides.cpp
===================================================================
--- cpp11-migrate/Core/FileOverrides.cpp
+++ cpp11-migrate/Core/FileOverrides.cpp
@@ -7,4 +7,10 @@
"Main source file override should exist!");
SM.overrideFileContents(FM.getFile(MainFileName),
llvm::MemoryBuffer::getMemBuffer(MainFileOverride));
+
+ for (HeaderOverrides::const_iterator I = Headers.begin(),
+ E = Headers.end(); I != E; ++I)
+ SM.overrideFileContents(
+ FM.getFile(I->second.FileName),
+ llvm::MemoryBuffer::getMemBuffer(I->second.FileOverride));
}
Index: cpp11-migrate/Core/FileOverrides.h
===================================================================
--- cpp11-migrate/Core/FileOverrides.h
+++ cpp11-migrate/Core/FileOverrides.h
@@ -24,6 +24,14 @@
class FileManager;
} // namespace clang
+/// \brief Container for storing override information for a single headers.
+struct HeaderOverride {
+ std::string FileName;
+ std::string FileOverride;
+};
+
+/// \brief Container mapping header file names to override information.
+typedef std::map<std::string, HeaderOverride> HeaderOverrides;
/// \brief Container storing the file content overrides for a source file.
struct SourceOverrides {
@@ -36,6 +44,7 @@
std::string MainFileName;
std::string MainFileOverride;
+ HeaderOverrides Headers;
};
/// \brief Maps source file names to content override information.
Index: cpp11-migrate/tool/Cpp11Migrate.cpp
===================================================================
--- cpp11-migrate/tool/Cpp11Migrate.cpp
+++ cpp11-migrate/tool/Cpp11Migrate.cpp
@@ -179,6 +179,19 @@
llvm::raw_fd_ostream FileStream(I->first.c_str(), ErrorInfo,
llvm::raw_fd_ostream::F_Binary);
FileStream << I->second.MainFileOverride;
+
+ // FIXME: The Migrator shouldn't be responsible for writing headers
+ // to disk. Instead, it should write replacement info and another tool
+ // should take all replacement info for a header from possibly many other
+ // migration processes and merge it into a final form. For now, the
+ // updated header is written to disk for testing purposes.
+ for (HeaderOverrides::const_iterator HeaderI = I->second.Headers.begin(),
+ HeaderE = I->second.Headers.end();
+ HeaderI != HeaderE; ++HeaderI) {
+ llvm::raw_fd_ostream HeaderStream(I->first.c_str(), ErrorInfo,
+ llvm::raw_fd_ostream::F_Binary);
+ HeaderStream << HeaderI->second.FileOverride;
+ }
}
// Report execution times.
Index: cpp11-migrate/Core/FileOverrides.cpp
===================================================================
--- cpp11-migrate/Core/FileOverrides.cpp
+++ cpp11-migrate/Core/FileOverrides.cpp
@@ -7,4 +7,10 @@
"Main source file override should exist!");
SM.overrideFileContents(FM.getFile(MainFileName),
llvm::MemoryBuffer::getMemBuffer(MainFileOverride));
+
+ for (HeaderOverrides::const_iterator I = Headers.begin(),
+ E = Headers.end(); I != E; ++I)
+ SM.overrideFileContents(
+ FM.getFile(I->second.FileName),
+ llvm::MemoryBuffer::getMemBuffer(I->second.FileOverride));
}
Index: cpp11-migrate/Core/FileOverrides.h
===================================================================
--- cpp11-migrate/Core/FileOverrides.h
+++ cpp11-migrate/Core/FileOverrides.h
@@ -24,6 +24,14 @@
class FileManager;
} // namespace clang
+/// \brief Container for storing override information for a single headers.
+struct HeaderOverride {
+ std::string FileName;
+ std::string FileOverride;
+};
+
+/// \brief Container mapping header file names to override information.
+typedef std::map<std::string, HeaderOverride> HeaderOverrides;
/// \brief Container storing the file content overrides for a source file.
struct SourceOverrides {
@@ -36,6 +44,7 @@
std::string MainFileName;
std::string MainFileOverride;
+ HeaderOverrides Headers;
};
/// \brief Maps source file names to content override information.
Index: cpp11-migrate/tool/Cpp11Migrate.cpp
===================================================================
--- cpp11-migrate/tool/Cpp11Migrate.cpp
+++ cpp11-migrate/tool/Cpp11Migrate.cpp
@@ -179,6 +179,19 @@
llvm::raw_fd_ostream FileStream(I->first.c_str(), ErrorInfo,
llvm::raw_fd_ostream::F_Binary);
FileStream << I->second.MainFileOverride;
+
+ // FIXME: The Migrator shouldn't be responsible for writing headers
+ // to disk. Instead, it should write replacement info and another tool
+ // should take all replacement info for a header from possibly many other
+ // migration processes and merge it into a final form. For now, the
+ // updated header is written to disk for testing purposes.
+ for (HeaderOverrides::const_iterator HeaderI = I->second.Headers.begin(),
+ HeaderE = I->second.Headers.end();
+ HeaderI != HeaderE; ++HeaderI) {
+ llvm::raw_fd_ostream HeaderStream(I->first.c_str(), ErrorInfo,
+ llvm::raw_fd_ostream::F_Binary);
+ HeaderStream << HeaderI->second.FileOverride;
+ }
}
// Report execution times.
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
