From b39e3470f4770ffacbf233b1617a1a0e48cca88b Mon Sep 17 00:00:00 2001
From: Alexandre Bique <bique.alexandre@gmail.com>
Date: Sat, 28 Feb 2009 20:37:45 +0000
Subject: [PATCH] removed IfElse node

---
 src/ast/generator-data.cc               |  7 +------
 src/ast/llvm-generator-visitor.cc       |  4 +++-
 src/ast/simplify-visitor.cc             | 32 +++++++++++++++++---------------
 src/lang/mugiwara/bison-parser/parser.y | 11 ++---------
 4 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/src/ast/generator-data.cc b/src/ast/generator-data.cc
index 58b3970..51e3800 100644
--- a/src/ast/generator-data.cc
+++ b/src/ast/generator-data.cc
@@ -254,13 +254,8 @@ const ag::Node ag::nodes[] = {
   },
 
   {"If", "Node", "If statement", {
-      {"Node *", "ifTrue"},
       {"Exp *", "cond"},
-      {"Label *", "endLabel"},
-    },
-  },
-
-  {"IfElse", "If", "If and Else statement", {
+      {"Node *", "ifTrue"},
       {"Node *", "ifFalse"},
     },
   },
diff --git a/src/ast/llvm-generator-visitor.cc b/src/ast/llvm-generator-visitor.cc
index 81bb141..bab4554 100644
--- a/src/ast/llvm-generator-visitor.cc
+++ b/src/ast/llvm-generator-visitor.cc
@@ -161,12 +161,14 @@ namespace ast
   LLVMGeneratorVisitor::visit(const If & node)
   {
     assert(node.ifTrue->nodeType == Label::nodeTypeId());
+    assert(node.ifFalse->nodeType == Label::nodeTypeId());
 
     Label * trueLabel = reinterpret_cast<Label *>(node.ifTrue);
+    Label * falseLabel = reinterpret_cast<Label *>(node.ifFalse);
 
     out_ << "  br i1 ";
     node.cond->accept(*this);
-    out_ << ", label %" << trueLabel->name << ", label %" << node.endLabel->name;
+    out_ << ", label %" << trueLabel->name << ", label %" << falseLabel->name;
   }
 
   void
diff --git a/src/ast/simplify-visitor.cc b/src/ast/simplify-visitor.cc
index 6039dd2..3249ac9 100644
--- a/src/ast/simplify-visitor.cc
+++ b/src/ast/simplify-visitor.cc
@@ -205,20 +205,22 @@ namespace ast
 
     simplifications_.push_back(&node);
 
-    Label * trueLabel = new Label;
-    trueLabel->name = std::string("trueLabel_") + nextId();
-    simplifications_.push_back(trueLabel);
-
-    node.ifTrue->accept(*this);
-    if (node.ifTrue->nodeType == Block::nodeTypeId())
-      BOOST_FOREACH(Node * elt, *reinterpret_cast<Block *>(node.ifTrue)->statements)
-        simplifications_.push_back(elt);
-    node.ifTrue = trueLabel;
-
-    Label * endLabel = new Label;
-    endLabel->name = std::string("endLabel_") + nextId();
-    simplifications_.push_back(endLabel);
-
-    node.endLabel = endLabel;
+#define EXPAND_BLOCK(True)                                              \
+    do {                                                                \
+      Label * True##Label = new Label;                                  \
+      True##Label->name = std::string(#True "Label_") + nextId();       \
+      simplifications_.push_back(True##Label);                          \
+                                                                        \
+      node.if##True->accept(*this);                                     \
+      if (node.if##True->nodeType == Block::nodeTypeId()) {             \
+        BOOST_FOREACH(Node * elt,                                       \
+                      *reinterpret_cast<Block *>(node.if##True)->statements) \
+          simplifications_.push_back(elt);                              \
+      }                                                                 \
+      node.if##True = True##Label;                                      \
+    } while (0)
+
+    EXPAND_BLOCK(True);
+    EXPAND_BLOCK(False);
   }
 }
diff --git a/src/lang/mugiwara/bison-parser/parser.y b/src/lang/mugiwara/bison-parser/parser.y
index c9dccf4..afb95e8 100644
--- a/src/lang/mugiwara/bison-parser/parser.y
+++ b/src/lang/mugiwara/bison-parser/parser.y
@@ -206,17 +206,10 @@ goto_statement: GOTO ID SEMICOL {
   $$             = gt;
  };
 
-if_statement: IF LPAR exp RPAR block {
+if_statement: IF LPAR exp RPAR block else_statement {
   ast::If * ifStmt = new ast::If();
   assert($3);
   assert($5);
-  ifStmt->cond   = $3;
-  ifStmt->ifTrue = $5;
-  $$             = ifStmt;
-} | IF LPAR exp RPAR block else_statement {
-  ast::IfElse * ifStmt = new ast::IfElse();
-  assert($3);
-  assert($5);
   assert($6);
   ifStmt->cond    = $3;
   ifStmt->ifTrue  = $5;
@@ -226,7 +219,7 @@ if_statement: IF LPAR exp RPAR block {
 
 else_statement: ELSE block { 
   $$ = $2;
-};
+} | /* epsylon */ { $$ = new ast::EmptyStatement; };
 
 type: is_const ID {
   $$          = createType($2);
-- 
2.11.4.GIT