citrun

commit ea92092e9b4d72b4dee2c1a843c530cf20951747
parent 3ca1b555fb64c22f3134592a6c56c948ac59e16b
Author: Kyle Milz <kyle@0x30.net>
Date:   Fri, 12 Aug 2016 00:16:25 -0600

src: decompose function into many functions

Diffstat:
M
src/inst_visitor.cc
 | 
98
+++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
M
src/inst_visitor.h
 | 
9
+++++++++

2 files changed, 67 insertions(+), 40 deletions(-)
diff --git a/src/inst_visitor.cc b/src/inst_visitor.cc
@@ -69,48 +69,66 @@ bool
 RewriteASTVisitor::VisitStmt(clang::Stmt *s)
 {
 	m_counters[TOTAL_STMT]++;
+	return true;
+}
 
-	if (clang::isa<clang::IfStmt>(s)) {
-		s = clang::cast<clang::IfStmt>(s)->getCond();
-		modify_stmt(s, m_counters[IF_STMT]);
-	}
-	else if (clang::isa<clang::ForStmt>(s)) {
-		s = clang::cast<clang::ForStmt>(s)->getCond();
-		modify_stmt(s, m_counters[FOR_STMT]);
-	}
-	else if (clang::isa<clang::WhileStmt>(s)) {
-		s = clang::cast<clang::WhileStmt>(s)->getCond();
-		modify_stmt(s, m_counters[WHILE_STMT]);
-	}
-	else if (clang::isa<clang::DoStmt>(s)) {
-		s = clang::cast<clang::DoStmt>(s)->getCond();
-		modify_stmt(s, m_counters[DOWHILE_STMT]);
-	}
-	else if (clang::isa<clang::SwitchStmt>(s)) {
-		s = clang::cast<clang::SwitchStmt>(s)->getCond();
-		modify_stmt(s, m_counters[SWITCH_STMT]);
-	}
-	else if (clang::isa<clang::ReturnStmt>(s)) {
-		s = clang::cast<clang::ReturnStmt>(s)->getRetValue();
-		modify_stmt(s, m_counters[RET_STMT_VAL]);
-	}
-	/*
-	else if (isa<BreakStmt>(s) || isa<ContinueStmt>(s) ||
-		|| isa<SwitchCase>(s)) {
-	}
-	else if (clang::isa<clang::DeclStmt>(s)) {
-	}
-	*/
-	else if (clang::isa<clang::CallExpr>(s)) {
-		modify_stmt(s, m_counters[CALL_EXPR]);
-	}
-	else if (clang::isa<clang::BinaryOperator>(s)) {
-		// If we can't rewrite the last token, don't even start.
-		if (s->getLocEnd().isMacroID())
-			return true;
-		modify_stmt(s, m_counters[BIN_OPER]);
-	}
+bool
+RewriteASTVisitor::VisitIfStmt(clang::IfStmt *i)
+{
+	modify_stmt(i->getCond(), m_counters[IF_STMT]);
+	return true;
+}
+
+bool
+RewriteASTVisitor::VisitForStmt(clang::ForStmt *f)
+{
+	modify_stmt(f->getCond(), m_counters[FOR_STMT]);
+	return true;
+}
+
+bool
+RewriteASTVisitor::VisitWhileStmt(clang::WhileStmt *w)
+{
+	modify_stmt(w->getCond(), m_counters[WHILE_STMT]);
+	return true;
+}
 
+bool
+RewriteASTVisitor::VisitDoStmt(clang::DoStmt *d)
+{
+	modify_stmt(d->getCond(), m_counters[DOWHILE_STMT]);
+	return true;
+}
+
+bool
+RewriteASTVisitor::VisitSwitchStmt(clang::SwitchStmt *s)
+{
+	modify_stmt(s->getCond(), m_counters[SWITCH_STMT]);
+	return true;
+}
+
+bool
+RewriteASTVisitor::VisitReturnStmt(clang::ReturnStmt *r)
+{
+	modify_stmt(r->getRetValue(), m_counters[RET_STMT_VAL]);
+	return true;
+}
+
+bool
+RewriteASTVisitor::VisitCallExpr(clang::CallExpr *c)
+{
+	modify_stmt(c, m_counters[CALL_EXPR]);
+	return true;
+}
+
+bool
+RewriteASTVisitor::VisitBinaryOperator(clang::BinaryOperator *b)
+{
+
+	// If we can't rewrite the last token, don't even start.
+	if (b->getLocEnd().isMacroID())
+		return true;
+	modify_stmt(b, m_counters[BIN_OPER]);
 	return true;
 }
 
diff --git a/src/inst_visitor.h b/src/inst_visitor.h
@@ -48,6 +48,15 @@ public:
 	bool VisitStmt(clang::Stmt *s);
 	bool VisitFunctionDecl(clang::FunctionDecl *f);
 
+	bool VisitIfStmt(clang::IfStmt *);
+	bool VisitForStmt(clang::ForStmt *);
+	bool VisitWhileStmt(clang::WhileStmt *);
+	bool VisitDoStmt(clang::DoStmt *);
+	bool VisitSwitchStmt(clang::SwitchStmt *);
+	bool VisitReturnStmt(clang::ReturnStmt *);
+	bool VisitCallExpr(clang::CallExpr *);
+	bool VisitBinaryOperator(clang::BinaryOperator *);
+
 	std::array<int, NCOUNTERS> m_counters;
 	std::array<std::string, NCOUNTERS> m_counter_descr;