kalc 0.8.0 → 0.8.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kalc (0.7.0)
+    kalc (0.8.0)
       parslet (~> 1.4)
 
 GEM

data/README.md

@@ -22,20 +22,25 @@ Numbers
 
 All numbers are floating point.
 
-    1 =\> 1.0 2.020 =\> 2.02 1.23E =\> 12300000000.0
+    1 => 1.0 
+    2.020 => 2.02 
+    1.23E => 12300000000.0
 
 Arithmetic
 ----------
 
-    1 + 1 / (10 \* 100) - 3 + 3 - (3 - 2) 1 \> 1 SUM(1, 2, 3, 4, 5)
+    1 + 1 / (10 * 100) - 3 + 3 - (3 - 2)
+    SUM(1, 2, 3, 4, 5)
 
 Arithmetic is standard infix with nesting via parenthesis.
 
 Logical operations
 ------------------
 
-    1 \> 2 ? 1 : 3 # Ternary (1 || 2) \> 3 1 \> 2 or 3 <2 # false OR(1 > 2, 3 \<
-    2, 8 == 8) # true
+    2 < 1 ? 1 : 3 # Ternary 
+    (1 || 2) # 1.0
+    2 or 3 # 2.0
+    OR(1 > 2, 3 < 2, 8 == 8) # true
 
 Variable assignment
 -------------------

data/lib/kalc/ast.rb

@@ -193,7 +193,7 @@ module Kalc
       end
 
       def eval(context)
-        @condition ? true_cond : false_cond
+        @condition.eval(context) ? @true_cond.eval(context) : @false_cond.eval(context)
       end
     end
 

data/lib/kalc/grammar.rb

@@ -33,7 +33,8 @@ class Kalc::Grammar < Parslet::Parser
           :left_brace => '{',
           :right_brace => '}',
           :comma => ',',
-          :colon => ':'
+          :colon => ':',
+          :question_mark => '?'
 
   def self.operators(operators={})
     trailing_chars = Hash.new { |hash,symbol| hash[symbol] = [] }
@@ -76,7 +77,6 @@ class Kalc::Grammar < Parslet::Parser
 
             :assign => ':=',
             :excel_equal => '=',
-            :question_mark => '?',
 
             :subtract => '-',
             :add => '+',
@@ -238,9 +238,9 @@ class Kalc::Grammar < Parslet::Parser
   rule(:conditional_expression) {
     logical_or_expression.as(:condition) >> 
       (question_mark >> 
-        conditional_expression.as(:true) >> 
+        conditional_expression.as(:true_cond) >> 
         colon >> 
-        conditional_expression.as(:false)).maybe
+        conditional_expression.as(:false_cond)).maybe
   }
 
   # 'a' = 1

data/lib/kalc/transform.rb

@@ -69,7 +69,7 @@ module Kalc
       Ast::Arithmetic.new(left, right, operator)
     }
 
-    rule(:condition => simple(:condition), :true => simple(:true_cond), :false => simple(:false_cond)) { 
+    rule(:condition => simple(:condition), :true_cond => simple(:true_cond), :false_cond => simple(:false_cond)) { 
       Ast::Conditional.new(condition, true_cond, false_cond)
     }
 

data/lib/kalc/version.rb

@@ -1,3 +1,3 @@
 module Kalc
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

data/spec/interpreter_spec.rb

@@ -78,6 +78,10 @@ describe Kalc::Interpreter do
     it { evaluate("1.01 = 1.02").should == false }
   end
 
+  context "Ternary" do
+    it { evaluate("1 > 2 ? 1 : 2").should == 2 }
+  end
+
   context "Exponents" do
     it { evaluate("1.23e+10").should == 12300000000.0 }
     it { evaluate("1.23e-10").should == 1.23e-10 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kalc
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors: