SplitDecls with TraverseTypeLoc (version 1)

Author: Valeriya-avt

lib/Transform/Clang/SplitDecls.cpp

@@ -31,10 +31,12 @@
 #include "tsar/Frontend/Clang/TransformationContext.h"
 #include "tsar/Support/Clang/Diagnostic.h"
 #include "tsar/Support/Clang/Utils.h"
+#include <clang/AST/TypeLoc.h>
 #include <clang/AST/Decl.h>
+#include <clang/AST/Type.h>
 #include <clang/AST/RecursiveASTVisitor.h>
 #include <clang/AST/Stmt.h>
-#include "clang/Rewrite/Core/Rewriter.h"
+#include <clang/Rewrite/Core/Rewriter.h>
 #include <llvm/ADT/DenseMap.h>
 #include <llvm/ADT/SmallString.h>
 #include <clang/Basic/SourceLocation.h>
@@ -129,7 +131,15 @@ class ClangSplitter : public RecursiveASTVisitor<ClangSplitter> {
     if (isNotSingleFlag) {
       SourceRange toInsert(notSingleDeclStart, notSingleDeclEnd);
       mRewriter.RemoveText(toInsert, RemoveEmptyLine);
-
+      bool isFirstVar = true;
+      while (varDeclsNames.size()) {
+        if (isFirstVar) {
+          mRewriter.InsertTextAfterToken(notSingleDeclEnd, varDeclsNames.back());
+          isFirstVar = false;
+        }
+        mRewriter.InsertTextAfterToken(notSingleDeclEnd, varDeclType + varDeclsNames.back());
+        varDeclsNames.pop_back();
+      }
     }
     if (mClauses.empty() || !isa<CompoundStmt>(S) &&
         !isa<ForStmt>(S) && !isa<DoStmt>(S) && !isa<WhileStmt>(S))
@@ -181,50 +191,43 @@ 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 TraverseTypeLoc(TypeLoc Loc) {
+  if (isNotSingleFlag && varDeclsNum == 1) {
+    TypeRange = Loc.getSourceRange();
+    std::string type = mRewriter.getRewrittenText(TypeRange);
+    std::cout << "type = " << type << std::endl;
+    varDeclType = type;
+    return RecursiveASTVisitor::TraverseTypeLoc(Loc);
+  }
+  return true;
+}
 
-  bool VisitVarDecl(VarDecl *S) { // to traverse the parse tree and visit each statement
+bool VisitVarDecl(VarDecl *S) { // to traverse the parse tree and visit each statement
     if (isNotSingleFlag) {
       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());
+        std::cout << "toInsert2" << Canvas.getRewrittenText(toInsert2).str() << std::endl;
+        std::cout << "varDeclRange" << Canvas.getRewrittenText(varDeclRange).str() << std::endl;
         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);
+        Canvas.ReplaceText(prevVarDeclRange, "");
         txtStr = Canvas.getRewrittenText(varDeclRange).str();
         auto it = std::remove(txtStr.begin(), txtStr.end(), ',');
         txtStr.erase(it, txtStr.end());
       }
-      mRewriter.InsertTextAfterToken(notSingleDeclEnd, txtStr + ";\n");
+      varDeclsNames.push_front(txtStr + ";\n");
     }
     return true;
   }
@@ -273,9 +276,12 @@ class ClangSplitter : public RecursiveASTVisitor<ClangSplitter> {
   DenseSet<DeclStmt*> mMultipleDecls;
   std::deque<SourceLocation> varDeclsStarts;
   std::deque<SourceLocation> varDeclsEnds;
+  std::deque<std::string> varDeclsNames;
   int varDeclsNum = 0;
   SourceLocation notSingleDeclStart;
   SourceLocation notSingleDeclEnd;
+  SourceRange TypeRange;
+  bool isArrayTypeFlag = false;
   std::string txtStr;
   std::string varDeclType;
 };