Reworking if statement

Using 2 phase approach
Flattening tbd

lib/vool/statements/if_statement.rb

@@ -10,19 +10,19 @@ module Vool
     end
 
     def to_mom( method )
-      merge = Mom::Noop.new(:merge)
-      if_true = add_jump(@if_true.to_mom( method ) , merge)
-      if_false = add_jump(@if_false.to_mom( method ) , merge)
-      cond = hoist_condition( method )
-      check = Mom::TruthCheck.new( cond.pop , if_true , if_false , merge)
-      [ *cond , check , if_true , if_false , merge ]
+      if_true =   @if_true.to_mom( method )
+      if_false =  @if_false.to_mom( method )
+      condition , hoisted  = hoist_condition( method )
+      check = Mom::IfStatement.new( Mom::TruthCheck.new(condition) , if_true , if_false )
+      check.hoisted = hoisted.to_mom(method) if hoisted
+      check
     end
 
     def hoist_condition( method )
       return [@condition] if @condition.is_a?(Vool::Named)
       local = method.create_tmp
-      assign = LocalAssignment.new( local , @condition).to_mom(method)
-      [assign , Vool::LocalVariable.new(local)]
+      assign = LocalAssignment.new( local , @condition)
+      [Vool::LocalVariable.new(local) , assign]
     end
 
     def collect(arr)
@@ -44,11 +44,5 @@ module Vool
       @if_true != nil
     end
 
-    private
-    def add_jump( block , merge)
-      block = [block] unless block.is_a?(Array)
-      block << Mom::Jump.new(merge)
-      block
-    end
   end
 end