From 00d85156da02a2bd9f0b1e5cc50cf0030f68c6bc Mon Sep 17 00:00:00 2001
From: Torsten Ruger <torsten@villataika.fi>
Date: Sat, 24 May 2014 10:18:54 +0300
Subject: [PATCH] rename conditional to if expression

---
 lib/ast/expression.rb                         |  2 +-
 ...itional_expression.rb => if_expression.rb} |  2 +-
 lib/parser/transform.rb                       |  2 +-
 test/fragments/test_if.rb                     | 22 +++++++++++++++++++
 test/parser/test_conditional.rb               |  2 +-
 test/parser/test_function_definition.rb       |  2 +-
 6 files changed, 27 insertions(+), 5 deletions(-)
 rename lib/ast/{conditional_expression.rb => if_expression.rb} (89%)
 create mode 100644 test/fragments/test_if.rb

diff --git a/lib/ast/expression.rb b/lib/ast/expression.rb
index 0465d622..f867dad5 100644
--- a/lib/ast/expression.rb
+++ b/lib/ast/expression.rb
@@ -34,7 +34,7 @@ end
 
 require_relative "basic_expressions"
 require_relative "compound_expressions"
-require_relative "conditional_expression"
+require_relative "if_expression"
 require_relative "while_expression"
 require_relative "function_expression"
 require_relative "operator_expressions"
diff --git a/lib/ast/conditional_expression.rb b/lib/ast/if_expression.rb
similarity index 89%
rename from lib/ast/conditional_expression.rb
rename to lib/ast/if_expression.rb
index 25bdac11..29b30854 100644
--- a/lib/ast/conditional_expression.rb
+++ b/lib/ast/if_expression.rb
@@ -1,5 +1,5 @@
 module Ast
-  class ConditionalExpression < Expression
+  class IfExpression < Expression
     attr_reader  :cond, :if_true, :if_false
     def initialize cond, if_true, if_false
       @cond, @if_true, @if_false = cond, if_true, if_false
diff --git a/lib/parser/transform.rb b/lib/parser/transform.rb
index f0242e4a..321eb25b 100644
--- a/lib/parser/transform.rb
+++ b/lib/parser/transform.rb
@@ -27,7 +27,7 @@ module Parser
     rule(:if => simple(:if), :conditional     => simple(:conditional),
          :if_true  => {:expressions => sequence(:if_true) , :else => simple(:else) },
          :if_false => {:expressions => sequence(:if_false) , :end => simple(:e) }) do
-           Ast::ConditionalExpression.new(conditional, if_true, if_false) 
+           Ast::IfExpression.new(conditional, if_true, if_false) 
          end
 
     rule(:while     => simple(:while),
diff --git a/test/fragments/test_if.rb b/test/fragments/test_if.rb
new file mode 100644
index 00000000..34867e09
--- /dev/null
+++ b/test/fragments/test_if.rb
@@ -0,0 +1,22 @@
+require_relative 'helper'
+
+class TestIf < MiniTest::Test
+  include Fragments
+
+  def test_if
+    @string_input = <<HERE
+    def itest(n)
+      if( n < 12)
+        putstring("then")
+      else
+        putstring("else")
+      end
+    end
+    itest(10)
+HERE
+    @should = [0x0,0xb0,0xa0,0xe3,0xa,0x0,0xa0,0xe3,0x1,0x0,0x0,0xeb,0x1,0x70,0xa0,0xe3,0x0,0x0,0x0,0xef,0x0,0x40,0x2d,0xe9,0x0,0x10,0xa0,0xe3,0x1,0x20,0xa0,0xe3,0x1,0x0,0x50,0xe3,0x6,0x0,0x0,0xda,0x1,0x30,0xa0,0xe1,0x2,0x10,0xa0,0xe1,0x2,0x40,0x83,0xe0,0x4,0x20,0xa0,0xe1,0x1,0x50,0x40,0xe2,0x5,0x0,0xa0,0xe1,0xf6,0xff,0xff,0xea,0x3f,0x0,0x2d,0xe9,0x2,0x0,0xa0,0xe1,0x12,0x0,0x0,0xeb,0x3f,0x0,0xbd,0xe8,0x0,0x80,0xbd,0xe8,0x0,0x40,0x2d,0xe9,0xa,0x20,0x41,0xe2,0x21,0x11,0x41,0xe0,0x21,0x12,0x81,0xe0,0x21,0x14,0x81,0xe0,0x21,0x18,0x81,0xe0,0xa1,0x11,0xa0,0xe1,0x1,0x31,0x81,0xe0,0x83,0x20,0x52,0xe0,0x1,0x10,0x81,0x52,0xa,0x20,0x82,0x42,0x30,0x20,0x82,0xe2,0x0,0x20,0xc0,0xe5,0x1,0x0,0x40,0xe2,0x0,0x0,0x51,0xe3,0xef,0xff,0xff,0x1b,0x0,0x80,0xbd,0xe8,0x0,0x40,0x2d,0xe9,0x0,0x10,0xa0,0xe1,0x24,0x0,0x8f,0xe2,0x9,0x0,0x80,0xe2,0xe9,0xff,0xff,0xeb,0x18,0x0,0x8f,0xe2,0xc,0x10,0xa0,0xe3,0x1,0x20,0xa0,0xe1,0x0,0x10,0xa0,0xe1,0x1,0x0,0xa0,0xe3,0x4,0x70,0xa0,0xe3,0x0,0x0,0x0,0xef,0x0,0x80,0xbd,0xe8,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x0]
+    parse 
+    write "if"
+  end
+end
+
diff --git a/test/parser/test_conditional.rb b/test/parser/test_conditional.rb
index 09931549..9cfac4f7 100644
--- a/test/parser/test_conditional.rb
+++ b/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
diff --git a/test/parser/test_function_definition.rb b/test/parser/test_function_definition.rb
index f5009ccf..2cc132f3 100644
--- a/test/parser/test_function_definition.rb
+++ b/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))] )] )