Cleanups for printing the terminators of CFGBlocks for "?", "||", and "&&" operators.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41654 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/AST/CFG.cpp b/AST/CFG.cpp
index 512c69e..83d91dd 100644
--- a/AST/CFG.cpp
+++ b/AST/CFG.cpp
@@ -960,7 +960,8 @@
};
class CFGBlockTerminatorPrint : public StmtVisitor<CFGBlockTerminatorPrint,
-void > {
+ void >
+{
std::ostream& OS;
StmtPrinterHelper* Helper;
public:
@@ -974,7 +975,7 @@
}
// Default case.
- void VisitStmt(Stmt* S) { S->printPretty(OS,Helper); }
+ void VisitStmt(Stmt* S) { S->printPretty(OS); }
void VisitForStmt(ForStmt* F) {
OS << "for (" ;
@@ -1004,6 +1005,31 @@
OS << '\n';
}
+ void VisitConditionalOperator(ConditionalOperator* C) {
+ C->getCond()->printPretty(OS,Helper);
+ OS << " ? ... : ...\n";
+ }
+
+ void VisitBinaryOperator(BinaryOperator* B) {
+ if (!B->isLogicalOp()) {
+ VisitExpr(B);
+ return;
+ }
+
+ B->getLHS()->printPretty(OS,Helper);
+
+ switch (B->getOpcode()) {
+ case BinaryOperator::LOr:
+ OS << " || ...\n";
+ return;
+ case BinaryOperator::LAnd:
+ OS << " && ...\n";
+ return;
+ default:
+ assert(false && "Invalid logical operator.");
+ }
+ }
+
void VisitExpr(Expr* E) {
E->printPretty(OS,Helper);
OS << '\n';