Add insertText function to insert text with same checks as rewriteSourceRange.

Author: john-h-kastner

clang/include/clang/3C/RewriteUtils.h

@@ -186,5 +186,7 @@ void rewriteSourceRange(Rewriter &R, const CharSourceRange &Range,
 
 void rewriteSourceRange(Rewriter &R, const SourceRange &Range,
                         const std::string &NewText, bool ErrFail = true);
+void insertText(Rewriter &R, SourceLocation S, const std::string &NewText,
+                bool ErrFail = true);
 
 #endif // LLVM_CLANG_3C_REWRITEUTILS_H

clang/lib/3C/DeclRewriter.cpp

@@ -566,23 +566,17 @@ void DeclRewriter::rewriteFunctionDecl(FunctionDeclReplacement *N) {
 void DeclRewriter::emitSupplementaryDeclarations(
   const std::vector<std::string> &SDecls, SourceLocation Loc) {
   // There are no supplementary declarations to emit. The AllDecls String
-  // will remain empty, so R.InsertTextAfterToken should no-op, but it's still
-  // and error to insert an empty string and an invalid source location,
-  // so short circuit here to be safe.
+  // will remain empty, so insertText should no-op, but it's still an error to
+  // insert an empty string at an invalid source location, so short circuit here
+  // to be safe.
   if (SDecls.empty())
     return;
 
   std::string AllDecls;
   for (std::string D : SDecls)
     AllDecls += "\n" + D;
 
-  bool RewriteSucess = !R.InsertTextAfterToken(Loc, AllDecls);
-  if (!RewriteSucess) {
-    // FIXME: Use rewriteSourceRange so that it handle emitting error messages.
-    llvm::errs()
-      << "Rewriting failed while emitting supplementary declaration.\n";
-    Loc.print(llvm::errs(), R.getSourceMgr());
-  }
+  insertText(R, Loc, AllDecls);
 }
 
 // A function to detect the presence of inline struct declarations

clang/lib/3C/RewriteUtils.cpp

@@ -116,6 +116,13 @@ void rewriteSourceRange(Rewriter &R, const CharSourceRange &Range,
   }
 }
 
+void insertText(Rewriter &R, SourceLocation S, const std::string &NewText,
+                bool ErrFail) {
+  SourceRange SR(
+    Lexer::getLocForEndOfToken(S, 0, R.getSourceMgr(), R.getLangOpts()), S);
+  rewriteSourceRange(R, SR, NewText, ErrFail);
+}
+
 static void emit(Rewriter &R, ASTContext &C, bool &StdoutModeEmittedMainFile) {
   if (_3COpts.Verbose)
     errs() << "Writing files out\n";
@@ -450,15 +457,8 @@ class AssignmentUpdater : public RecursiveASTVisitor<AssignmentUpdater> {
           if (ABInfo.needsRangeBound(CV)) {
             std::string TmpVarName = "__3c_tmp_" + CV->getName();
             rewriteSourceRange(R, O->getLHS()->getSourceRange(), TmpVarName);
-            bool InsertFail = R.InsertTextAfterToken(O->getEndLoc(),
-                                                          ", " + CV->getName() +
-                                                          " = " + TmpVarName);
-            if (InsertFail) {
-              // FIXME: Use rewriteSourceRange so that it handle emitting error messages.
-              llvm::errs()
-                << "Rewriting failed while updating assignment!\n";
-              O->getEndLoc().print(llvm::errs(), R.getSourceMgr());
-            }
+            insertText(R, O->getEndLoc(),
+                       ", " + CV->getName() + " = " + TmpVarName);
           }
         }
       }