From 6299a2d2fb198845c9b140a308b6b7d433d5902b Mon Sep 17 00:00:00 2001
From: Alon Zakai <alonzakai@gmail.com>
Date: Mon, 7 Mar 2016 15:03:08 -0800
Subject: update if parsing to new spec rules

---
 src/passes/Print.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'src/passes/Print.cpp')

diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
index f365db02f..e8e917a6e 100644
--- a/src/passes/Print.cpp
+++ b/src/passes/Print.cpp
@@ -65,11 +65,22 @@ struct PrintSExpression : public WasmVisitor<PrintSExpression, void> {
     decIndent();
   }
   void visitIf(If *curr) {
-    printOpening(o, curr->ifFalse ? "if_else" : "if");
+    printOpening(o, "if");
     incIndent();
     printFullLine(curr->condition);
-    printFullLine(curr->ifTrue);
-    if (curr->ifFalse) printFullLine(curr->ifFalse);
+    // ifTrue and False have implict blocks, avoid printing them if possible
+    if (curr->ifTrue->is<Block>() && curr->ifTrue->dyn_cast<Block>()->name.isNull() && curr->ifTrue->dyn_cast<Block>()->list.size() == 1) {
+      printFullLine(curr->ifTrue->dyn_cast<Block>()->list.back());
+    } else {
+      printFullLine(curr->ifTrue);
+    }
+    if (curr->ifFalse) {
+      if (curr->ifFalse->is<Block>() && curr->ifFalse->dyn_cast<Block>()->name.isNull() && curr->ifFalse->dyn_cast<Block>()->list.size() == 1) {
+        printFullLine(curr->ifFalse->dyn_cast<Block>()->list.back());
+      } else {
+        printFullLine(curr->ifFalse);
+      }
+    }
     decIndent();
   }
   void visitLoop(Loop *curr) {
-- 
cgit v1.2.3