From 0acd502afe118a82f480d184271fe60e5551746f Mon Sep 17 00:00:00 2001
From: Edwin Vane <edwin.vane@intel.com>
Date: Fri, 30 Aug 2013 19:28:59 +0000
Subject: cpp11-migrate: Refactor for driver model of operation

Massive simplification of how replacements and file overrides are handled by
the migrator:
* Sources and headers are all treated the same.
* All replacements for a given translation unit are stored in the same
  TranslationUnitReplacements structure.
* Change tracking is updated only from main file; no need for
  propagating "is tracking" flag around.
* Transform base class no longer responsible for applying replacements.
  They are simply stored and main() looks after deduplication and
  application.
* Renamed -yaml-only to -serialize-replacements. Same restrictions apply:
  Can only request one transform. New restriction: formatting cannot also
  be turned on since it's basically a transform.
* If -serialize-replacements is requested, changes to files will not be
  applied on disk.
* Changed behaviour of function generating names for serialized
  replacements: Only the main source file goes into the name of the file
  since a file may contain changes for multiple different files.
* Updated HeaderReplacements LIT test for new serialization behaviour.
  * Replaced old test that ensures replacements are not serialized if
    -serialize-replacements is not provided. New version ensures changes
    are made directly to all files in the translation unit.
* Updated unit tests.
  * Due to major simplification of structures in FileOverrides.h, the
    FileOverridesTest is quite a bit simpler now.

Differential Revision: http://llvm-reviews.chandlerc.com/D1545

llvm-svn: 189689
---
 .../cpp11-migrate/Core/Reformatting.cpp            | 46 ++++++++--------------
 1 file changed, 16 insertions(+), 30 deletions(-)

(limited to 'clang-tools-extra/cpp11-migrate/Core/Reformatting.cpp')

diff --git a/clang-tools-extra/cpp11-migrate/Core/Reformatting.cpp b/clang-tools-extra/cpp11-migrate/Core/Reformatting.cpp
index 4e14ea5784e..50ba1f19f7a 100644
--- a/clang-tools-extra/cpp11-migrate/Core/Reformatting.cpp
+++ b/clang-tools-extra/cpp11-migrate/Core/Reformatting.cpp
@@ -22,39 +22,23 @@
 
 using namespace clang;
 
-void Reformatter::reformatChanges(SourceOverrides &Overrides) {
-  llvm::IntrusiveRefCntPtr<clang::DiagnosticOptions> DiagOpts(
-      new DiagnosticOptions());
-  DiagnosticsEngine Diagnostics(
-      llvm::IntrusiveRefCntPtr<DiagnosticIDs>(new DiagnosticIDs()),
-      DiagOpts.getPtr());
-  FileManager Files((FileSystemOptions()));
-  SourceManager SM(Diagnostics, Files);
-
-  reformatChanges(Overrides, SM);
-}
-
-void Reformatter::reformatChanges(SourceOverrides &Overrides,
-                                  clang::SourceManager &SM) {
-  tooling::Replacements Replaces;
-  Overrides.applyOverrides(SM);
-  if (Overrides.isSourceOverriden())
-    Replaces = reformatSingleFile(Overrides.getMainFileName(),
-                                  Overrides.getChangedRanges(), SM);
-
-  for (HeaderOverrides::const_iterator I = Overrides.headers_begin(),
-                                       E = Overrides.headers_end();
+void Reformatter::reformatChanges(const FileOverrides &FileStates,
+                                  clang::SourceManager &SM,
+                                  clang::tooling::ReplacementsVec &Replaces) {
+  FileStates.applyOverrides(SM);
+
+  for (FileOverrides::ChangeMap::const_iterator
+           I = FileStates.getChangedRanges().begin(),
+           E = FileStates.getChangedRanges().end();
        I != E; ++I) {
-    const HeaderOverride &Header = I->getValue();
-    const tooling::Replacements &HeaderReplaces =
-        reformatSingleFile(Header.getHeaderPath(), Header.getChanges(), SM);
-    Replaces.insert(HeaderReplaces.begin(), HeaderReplaces.end());
+    reformatSingleFile(I->getKey(), I->getValue(), SM, Replaces);
   }
-  Overrides.applyReplacements(Replaces, SM);
 }
 
-tooling::Replacements Reformatter::reformatSingleFile(
-    llvm::StringRef FileName, const ChangedRanges &Changes, SourceManager &SM) {
+void Reformatter::reformatSingleFile(
+    const llvm::StringRef FileName, const ChangedRanges &Changes,
+    SourceManager &SM, clang::tooling::ReplacementsVec &FormatReplacements) {
+
   const clang::FileEntry *Entry = SM.getFileManager().getFile(FileName);
   assert(Entry && "expected an existing file");
 
@@ -72,5 +56,7 @@ tooling::Replacements Reformatter::reformatSingleFile(
   }
 
   Lexer Lex(ID, SM.getBuffer(ID), SM, getFormattingLangOpts(Style.Standard));
-  return format::reformat(Style, Lex, SM, ReformatRanges);
+  const tooling::Replacements &R =
+      format::reformat(Style, Lex, SM, ReformatRanges);
+  std::copy(R.begin(), R.end(), std::back_inserter(FormatReplacements));
 }
-- 
cgit v1.2.3