Split declaration statements with ExternalRewriter (version 1)

Author: Valeriya-avt

include/tsar/Transform/Clang/SplitDecls.h

@@ -32,6 +32,17 @@
 #include <bcl/utility.h>
 #include <llvm/Pass.h>
 
+#include "tsar/Analysis/Clang/GlobalInfoExtractor.h"
+#include <clang/AST/RecursiveASTVisitor.h>
+#include <clang/AST/TypeLoc.h>
+#include <llvm/ADT/BitmaskEnum.h>
+#include <llvm/ADT/DenseMapInfo.h>
+#include <llvm/ADT/StringMap.h>
+#include <llvm/ADT/StringSet.h>
+#include <map>
+#include <memory>
+#include <vector>
+
 namespace llvm {
 /// This pass separates variable declaration statements that contain multiple
 /// variable declarations at once into single declarations.

lib/Transform/Clang/SplitDecls.cpp

@@ -30,6 +30,7 @@
 #include "tsar/Frontend/Clang/Pragma.h"
 #include "tsar/Frontend/Clang/TransformationContext.h"
 #include "tsar/Support/Clang/Diagnostic.h"
+#include "tsar/Support/Clang/Utils.h"
 #include <clang/AST/Decl.h>
 #include <clang/AST/RecursiveASTVisitor.h>
 #include <clang/AST/Stmt.h>
@@ -45,6 +46,8 @@
 #include <vector>
 #include <string>
 #include <stack>
+#include <iostream>
+#include <deque>
 
 using namespace llvm;
 using namespace clang;
@@ -79,6 +82,7 @@ namespace {
 /// after it. It also checks absence a macros in this scope and print some
 /// other warnings.
 bool isNotSingleFlag = false;
+bool isAfterNotSingleFlag = false;
 class ClangSplitter : public RecursiveASTVisitor<ClangSplitter> {
 public:
   ClangSplitter(TransformationContext &TfmCtx, const ASTImportInfo &ImportInfo,
@@ -94,16 +98,6 @@ class ClangSplitter : public RecursiveASTVisitor<ClangSplitter> {
     }
     Pragma P(*S); // the Pragma class is used to check if a statement is a pragma or not
     if (findClause(P, ClauseId::SplitDeclaration, mClauses)) { // mClauses contains all SplitDeclaration pragmas
-      std::vector<std::string> inits;
-      while (starts.size()) {
-        SourceRange toInsert(starts.top(), ends.top());
-        CharSourceRange txtToInsert(toInsert, true);
-        starts.pop();
-        ends.pop();
-        txtStr = mRewriter.getRewrittenText(txtToInsert);
-        txtStr += ";\n";
-        inits.push_back(txtStr);
-      }
       llvm::SmallVector<clang::CharSourceRange, 8> ToRemove; // a vector of statements that will match the root in the tree
       auto IsPossible = pragmaRangeToRemove(P, mClauses, mSrcMgr, mLangOpts,
                                             mImportInfo, ToRemove); // ToRemove - the range of positions we want to remove
@@ -124,21 +118,18 @@ class ClangSplitter : public RecursiveASTVisitor<ClangSplitter> {
       for (auto SR : ToRemove)
         mRewriter.RemoveText(SR, RemoveEmptyLine); // delete each range
       if (isNotSingleFlag) {
-        SourceRange toInsert(start, end);
+        SourceRange toInsert(notSingleDeclStart, notSingleDeclEnd);
         mRewriter.RemoveText(toInsert, RemoveEmptyLine);
       }
-      //Rewriter::RewriteOptions RemoveEmptyLine;
-      for (std::vector<std::string>::iterator it = inits.begin(); it != inits.end(); ++it) {
-        mRewriter.InsertTextAfterToken(end, *it);
-      }
       return true;
     }
     Rewriter::RewriteOptions RemoveEmptyLine;
     RemoveEmptyLine.RemoveLineIfEmpty = false;
 
     if (isNotSingleFlag) {
-      SourceRange toInsert(start, end);
+      SourceRange toInsert(notSingleDeclStart, notSingleDeclEnd);
       mRewriter.RemoveText(toInsert, RemoveEmptyLine);
+
     }
     if (mClauses.empty() || !isa<CompoundStmt>(S) &&
         !isa<ForStmt>(S) && !isa<DoStmt>(S) && !isa<WhileStmt>(S))
@@ -190,30 +181,62 @@ class ClangSplitter : public RecursiveASTVisitor<ClangSplitter> {
     }
   }
 
+  // bool VisitVarDecl(VarDecl *S) { // to traverse the parse tree and visit each statement
+  //   if (isNotSingleFlag) {
+  //     std::string varType = S->getType().getAsString();
+  //     SourceLocation locat = S->getLocation();
+  //     CharSourceRange txtToInsert(locat, true);
+  //     std::string varName = S->getName().str();
+  //     int n = varType.length();
+  //     char char_array[n + 1];
+  //     strcpy(char_array, varType.c_str());
+  //     if (strchr(char_array, '[')) {
+  //       buildTxtStr(varType, varName);
+  //     } else {
+  //       txtStr = varType + " " + varName + ";\n";
+  //     }
+  //     mRewriter.InsertTextAfterToken(notSingleDeclEnd, txtStr);
+  //   }
+  //   return true;
+  // }
+
   bool VisitVarDecl(VarDecl *S) { // to traverse the parse tree and visit each statement
     if (isNotSingleFlag) {
-      std::string varType = S->getType().getAsString();
-      SourceLocation locat = S->getLocation();
-      CharSourceRange txtToInsert(locat, true);
-      std::string varName = S->getName().str();
-      int n = varType.length();
-      char char_array[n + 1];
-      strcpy(char_array, varType.c_str());
-      if (strchr(char_array, '[')) {
-        buildTxtStr(varType, varName);
-      } else {
-        txtStr = varType + " " + varName + ";\n";
+      varDeclsNum++;
+      SourceRange toInsert(notSingleDeclStart, notSingleDeclEnd);
+      ExternalRewriter Canvas(toInsert, mSrcMgr, mLangOpts);
+      SourceRange Range(S->getLocation());
+      varDeclsStarts.push_front(S->getBeginLoc());
+      varDeclsEnds.push_front(S->getEndLoc());
+      SourceRange varDeclRange(S->getBeginLoc(), S->getEndLoc());
+      if (varDeclsNum == 1) {
+        SourceRange toInsert2(Range.getBegin(), S->getEndLoc());
+        txtStr = Canvas.getRewrittenText(varDeclRange).str();
+        Canvas.RemoveText(toInsert2);
+        varDeclType = Canvas.getRewrittenText(varDeclRange);
+      }
+      if (varDeclsNum > 1) {
+        SourceRange prevVarDeclRange(varDeclsStarts.back(), varDeclsEnds.back());
+        varDeclsStarts.pop_back();
+        varDeclsEnds.pop_back();
+        Canvas.ReplaceText(prevVarDeclRange, varDeclType);
+        txtStr = Canvas.getRewrittenText(varDeclRange).str();
+        auto it = std::remove(txtStr.begin(), txtStr.end(), ',');
+        txtStr.erase(it, txtStr.end());
       }
-      mRewriter.InsertTextAfterToken(end, txtStr);
+      mRewriter.InsertTextAfterToken(notSingleDeclEnd, txtStr + ";\n");
     }
     return true;
   }
 
   bool TraverseDeclStmt(DeclStmt *S) {
-    if(!S->isSingleDecl()) {
+    bool tmp;
+    if(!(S->isSingleDecl())) {
+      if (!isNotSingleFlag)
+        varDeclsNum = 0;
       isNotSingleFlag = true;
-      start = S->getBeginLoc();
-      end = S->getEndLoc();
+      notSingleDeclStart = S->getBeginLoc();
+      notSingleDeclEnd = S->getEndLoc();
     } else {
       isNotSingleFlag = false;
     }
@@ -248,11 +271,13 @@ class ClangSplitter : public RecursiveASTVisitor<ClangSplitter> {
   SmallVector<Stmt *, 1> mClauses;
   bool mActiveSplit = false;
   DenseSet<DeclStmt*> mMultipleDecls;
-  std::stack<SourceLocation> starts;
-  std::stack<SourceLocation> ends;
-  SourceLocation start;
-  SourceLocation end;
+  std::deque<SourceLocation> varDeclsStarts;
+  std::deque<SourceLocation> varDeclsEnds;
+  int varDeclsNum = 0;
+  SourceLocation notSingleDeclStart;
+  SourceLocation notSingleDeclEnd;
   std::string txtStr;
+  std::string varDeclType;
 };
 }
 
@@ -272,4 +297,4 @@ bool ClangSplitDeclsPass::runOnModule(llvm::Module &M) {
   ClangSplitter Vis(*TfmCtx, *ImportInfo, GIP.getRawInfo());
   Vis.TraverseDecl(TfmCtx->getContext().getTranslationUnitDecl());
   return false;
-}
+}