rename conditional to if expression

test/parser/test_conditional.rb

@@ -23,7 +23,7 @@ HERE
     @parse_output = {:if=>"if", :conditional=>{:integer=>"0"}, 
     :if_true=>{:expressions=>[{:integer=>"42"}], :else=>"else"}, 
     :if_false=>{:expressions=>[{:integer=>"667"}], :end=>"end"}}
-    @transform_output = Ast::ConditionalExpression.new(  Ast::IntegerExpression.new(0),
+    @transform_output = Ast::IfExpression.new(  Ast::IntegerExpression.new(0),
                   [Ast::IntegerExpression.new(42)], [Ast::IntegerExpression.new(667)])
 
     @parser = @parser.conditional

test/parser/test_function_definition.rb

@@ -54,7 +54,7 @@ HERE
     :end=>"end"}
     @transform_output = Ast::FunctionExpression.new(:ofthen, 
           [Ast::NameExpression.new("n")] , 
-          [Ast::ConditionalExpression.new(Ast::IntegerExpression.new(0), 
+          [Ast::IfExpression.new(Ast::IntegerExpression.new(0), 
             [Ast::OperatorExpression.new("=", Ast::NameExpression.new("isit"),
               Ast::IntegerExpression.new(42))],
           [Ast::OperatorExpression.new("=", Ast::NameExpression.new("maybenot"),Ast::IntegerExpression.new(667))] )] )