kalc 0.8.1 → 0.9.0

data/lib/kalc/interpreter.rb

@@ -17,7 +17,7 @@ module Kalc
         env.add_function(:OR, lambda { |cxt, *args|
           retval = false
           args.each do |arg|
-            if arg.eval(cxt) == true
+            if arg.eval(cxt)
               retval = true
               break
             end
@@ -25,14 +25,14 @@ module Kalc
           retval
         })
 
-        env.add_function(:NOT, lambda { |cxt, val|  
+        env.add_function(:NOT, lambda { |cxt, val|
           !val.eval(cxt)
         })
 
         env.add_function(:AND, lambda { |cxt, *args|
           retval = true
           args.each do |arg|
-            if arg.eval(cxt) == false
+            unless arg.eval(cxt)
               retval = false
               break
             end
@@ -40,29 +40,29 @@ module Kalc
           retval
         })
 
-        env.add_function(:RAND, lambda { |cxt, val|  
+        env.add_function(:RAND, lambda { |cxt, val|
           rand(val.eval(cxt))
         })
 
-        env.add_function(:SYSTEM, lambda { |cxt, val|  
+        env.add_function(:SYSTEM, lambda { |cxt, val|
           throw "Nope.  I don't think so!"
         })
 
         # IS?
-        env.add_function(:ISLOGICAL, lambda { |cxt, val|  
+        env.add_function(:ISLOGICAL, lambda { |cxt, val|
           newval = val.eval(cxt)
           newval == true || newval == false
         })
 
-        env.add_function(:ISNONTEXT, lambda { |cxt, val|  
+        env.add_function(:ISNONTEXT, lambda { |cxt, val|
           !val.eval(cxt).is_a? String
         })
 
-        env.add_function(:ISNUMBER, lambda { |cxt, val|  
+        env.add_function(:ISNUMBER, lambda { |cxt, val|
           val.eval(cxt).is_a? Numeric
         })
 
-        env.add_function(:ISTEXT, lambda { |cxt, val|  
+        env.add_function(:ISTEXT, lambda { |cxt, val|
           val.eval(cxt).is_a? String
         })
 
@@ -71,27 +71,27 @@ module Kalc
           val.eval(cxt).abs
         })
 
-        env.add_function(:DEGREES, lambda { | cxt, val|  
+        env.add_function(:DEGREES, lambda { |cxt, val|
           val.eval(cxt) * (180.0 / Math::PI)
         })
 
-        env.add_function(:PRODUCT, lambda { |cxt, *args|  
+        env.add_function(:PRODUCT, lambda { |cxt, *args|
           args.map { |a| a.eval(cxt) }.inject(:*)
         })
 
-        env.add_function(:RADIANS, lambda { |cxt, val|  
+        env.add_function(:RADIANS, lambda { |cxt, val|
           val.eval(cxt) * (Math::PI / 180.0)
         })
 
-        env.add_function(:ROUND, lambda { |cxt, num, digits|  
+        env.add_function(:ROUND, lambda { |cxt, num, digits|
           num.eval(cxt).round(digits.eval(cxt))
         })
 
-        env.add_function(:SUM, lambda { |cxt, *args|  
+        env.add_function(:SUM, lambda { |cxt, *args|
           args.map { |a| a.eval(cxt) }.inject(:+)
         })
 
-        env.add_function(:TRUNC, lambda { |cxt, val|  
+        env.add_function(:TRUNC, lambda { |cxt, val|
           Integer(val.eval(cxt))
         })
 
@@ -99,15 +99,8 @@ module Kalc
           Math.log(val.eval(cxt))
         })
 
-        math_funs = 
-          [ 'acos', 'acosh', 'asin', 'asinh', 'atan', 'atanh',
-            'cbrt', 'cos', 'cosh',
-            'erf', 'erfc', 'exp',
-            'gamma',
-            'lgamma', 'log', 'log2', 'log10',
-            'sin', 'sinh', 'sqrt',
-            'tan', 'tanh',
-             ]
+        math_funs =
+            %w(acos acosh asin asinh atan atanh cbrt cos cosh erf erfc exp gamma lgamma log log2 log10 sin sinh sqrt tan tanh)
 
         math_funs.each do |math_fun|
           env.add_function(math_fun.upcase.to_sym, lambda { |cxt, val|
@@ -116,19 +109,12 @@ module Kalc
         end
 
         # Strings
-        string_funs = 
-          [
-            'chomp', 'chop', 'chr', 'clear', 'count',
-            'downcase',
-            'hex', 
-            'inspect', 'intern', 'to_sym',
-            'length', 'size', 'lstrip', 
-            'succ', 'next', 
-            'oct', 'ord',
-            'reverse', 'rstrip',
-            'strip', 'swapcase', 'to_c', 'to_f', 'to_i', 'to_r',
-            'upcase'
-          ]
+        string_funs =
+            %w(chomp chop chr clear count
+            downcase
+            hex
+            inspect intern
+            to_sym length size lstrip succ next oct ord reverse rstrip strip swapcase to_c to_f to_i to_r upcase)
 
         string_funs.each do |str_fun|
           env.add_function(str_fun.upcase.to_sym, lambda { |cxt, val|
@@ -140,7 +126,7 @@ module Kalc
           Integer(val.eval(cxt)).chr
         })
 
-        env.add_function(:CLEAN, lambda { |cxt, val| 
+        env.add_function(:CLEAN, lambda { |cxt, val|
           val.eval(cxt).gsub(/\P{ASCII}/, '')
         })
 
@@ -148,7 +134,7 @@ module Kalc
           val.eval(cxt).ord
         })
 
-        env.add_function(:CONCATENATE, lambda { |cxt, *args| 
+        env.add_function(:CONCATENATE, lambda { |cxt, *args|
           args.map { |a| a.eval(cxt) }.join
         })
 
@@ -167,11 +153,11 @@ module Kalc
 
         env.add_function(:FIXED, lambda { |cxt, val, decimal_places, no_commas|
           output = "%.#{Integer(decimal_places.eval(cxt))}f" % Float(val.eval(cxt))
-          output = output.to_s.reverse.scan(/(?:\d*\.)?\d{1,3}-?/).join(',').reverse if no_commas.eval(cxt) == false
+          output = output.to_s.reverse.scan(/(?:\d*\.)?\d{1,3}-?/).join(',').reverse if !no_commas.eval(cxt)
           output
         })
 
-        env.add_function(:LEFT, lambda { |cxt, val, number_of_characters| 
+        env.add_function(:LEFT, lambda { |cxt, val, number_of_characters|
           num = Integer(number_of_characters.eval(cxt)) - 1
           val.eval(cxt)[0..num]
         })
@@ -180,12 +166,12 @@ module Kalc
           val.eval(cxt).length
         })
 
-        env.add_function(:LOWER, lambda { |cxt, val|  
+        env.add_function(:LOWER, lambda { |cxt, val|
           val.eval(cxt).downcase
         })
 
         env.add_function(:MID, lambda { |cxt, val, start_position, number_of_characters|
-    
+
           start = Integer(start_position.eval(cxt)) - 1
           chars = Integer(number_of_characters.eval(cxt)) - 1
 
@@ -193,7 +179,7 @@ module Kalc
         })
 
         env.add_function(:PROPER, lambda { |cxt, val|
-          val.eval(cxt).split(" ").map { |c| c.capitalize }.join(" ")
+          val.eval(cxt).split(' ').map { |c| c.capitalize }.join(' ')
         })
 
         env.add_function(:REPLACE, lambda { |cxt, val, start_position, number_of_chars, new_text|
@@ -204,7 +190,7 @@ module Kalc
           output
         })
 
-        env.add_function(:REPT, lambda { |cxt, val, number_of_times| 
+        env.add_function(:REPT, lambda { |cxt, val, number_of_times|
           val.eval(cxt) * Integer(number_of_times.eval(cxt))
         })
 
@@ -218,7 +204,7 @@ module Kalc
           string2.eval(cxt).downcase[start..-1].index(string1.eval(cxt).downcase) + 1
         })
 
-        env.add_function(:SUBSTITUTE, lambda { |cxt, val, old_text, new_text|  
+        env.add_function(:SUBSTITUTE, lambda { |cxt, val, old_text, new_text|
           val.eval(cxt).gsub(old_text.eval(cxt), new_text.eval(cxt))
         })
 
@@ -226,7 +212,7 @@ module Kalc
           val.eval(cxt).strip
         })
 
-        env.add_function(:UPPER, lambda { |cxt, val|  
+        env.add_function(:UPPER, lambda { |cxt, val|
           val.eval(cxt).upcase
         })
 
@@ -235,28 +221,28 @@ module Kalc
         })
 
         # Regular expressions
-        
+
         env.add_function(:REGEXP_MATCH, lambda { |cxt, val, regex|
           r = regex.eval(cxt)
           /#{r}/.match(val.eval(cxt))
         })
-  
+
         env.add_function(:REGEXP_REPLACE, lambda { |cxt, val, regex, to_replace|
           r = regex.eval(cxt)
 
           val.eval(cxt).gsub(/#{r}/, to_replace.eval(cxt))
         })
-        
+
         # Debug
-        env.add_function(:P, lambda { |cxt, *output|  
+        env.add_function(:P, lambda { |cxt, *output|
           p output
         })
 
-        env.add_function(:PP, lambda { |cxt, *output|  
+        env.add_function(:PP, lambda { |cxt, *output|
           pp output
         })
 
-        env.add_function(:PUTS, lambda { |cxt, output|  
+        env.add_function(:PUTS, lambda { |cxt, output|
           puts output.eval(cxt)
         })
 

data/lib/kalc/repl.rb

@@ -17,35 +17,31 @@ module Kalc
       # Load Kalc with debug
       load_env
 
-      puts "You are ready to go.  Have fun!"
-      puts ""
+      puts 'You are ready to go.  Have fun!'
+      puts ''
 
-      ast = nil
-
-      function_list = [
-        'quit', 'exit', 'functions', 'variables', 'ast'
-      ] + @kalc.interpreter.env.functions.map { |f| f.first }
+      function_list = %w(quit exit functions variables ast) + @kalc.interpreter.env.functions.map { |f| f.first }
 
       begin
-        comp = proc { |s| function_list.grep( /^#{Regexp.escape(s)}/ ) }
-        Readline.completion_append_character = ""
+        comp = proc { |s| function_list.grep(/^#{Regexp.escape(s)}/) }
+        Readline.completion_append_character = ''
         Readline.completion_proc = comp
 
         while input = Readline.readline("kalc-#{Kalc::VERSION} > ", true)
           begin
             case
-            when (input == 'quit' || input == 'exit')
-              break
-            when input == "functions"
-              puts @kalc.interpreter.env.functions.map { |f| f.first }.join(", ")
-            when input == 'variables'
-              puts @kalc.interpreter.env.variables.map { |v| "#{v[0]} = #{v[1]}" }.join("\n\r")
-            when input == 'reload'
-              load_env
-            when input == 'ast'
-              pp @kalc.ast
-            when input != ""
-              puts @kalc.run(input)
+              when (input == 'quit' || input == 'exit')
+                break
+              when input == 'functions'
+                puts @kalc.interpreter.env.functions.map { |f| f.first }.join(', ')
+              when input == 'variables'
+                puts @kalc.interpreter.env.variables.map { |v| "#{v[0]} = #{v[1]}" }.join("\n\r")
+              when input == 'reload'
+                load_env
+              when input == 'ast'
+                pp @kalc.ast
+              when input != ''
+                puts @kalc.run(input)
             end
           rescue Parslet::ParseFailed => e
             puts e, g.root.error_tree

data/lib/kalc/transform.rb

@@ -1,24 +1,24 @@
 module Kalc
   class Transform < Parslet::Transform
 
-    rule(:condition => subtree(:condition)) { 
-      condition 
+    rule(:condition => subtree(:condition)) {
+      condition
     }
 
-    rule(:left => subtree(:left), :ops => []) { 
-      left 
+    rule(:left => subtree(:left), :ops => []) {
+      left
     }
 
-    rule(:right => subtree(:right), :ops => []) { 
-      right 
+    rule(:right => subtree(:right), :ops => []) {
+      right
     }
 
-    rule(:left => subtree(:left), :non_ops => []) { 
-      left 
+    rule(:left => subtree(:left), :non_ops => []) {
+      left
     }
 
-    rule(:right => subtree(:right), :non_ops => []) { 
-      right 
+    rule(:right => subtree(:right), :non_ops => []) {
+      right
     }
 
     rule(:commands => sequence(:commands)) {
@@ -53,8 +53,8 @@ module Kalc
       Ast::BooleanValue.new(boolean)
     }
 
-    rule(:number => simple(:number)) { 
-      Ast::FloatingPointNumber.new(number) 
+    rule(:number => simple(:number)) {
+      Ast::FloatingPointNumber.new(number)
     }
 
     rule(:non_ops => subtree(:non_ops)) {
@@ -65,11 +65,11 @@ module Kalc
       Ast::Ops.new(left, ops)
     }
 
-    rule(:left => simple(:left), :right => simple(:right), :operator => simple(:operator)) { 
+    rule(:left => simple(:left), :right => simple(:right), :operator => simple(:operator)) {
       Ast::Arithmetic.new(left, right, operator)
     }
 
-    rule(:condition => simple(:condition), :true_cond => simple(:true_cond), :false_cond => 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)
     }
 
@@ -89,7 +89,7 @@ module Kalc
       paren_list
     }
 
-    rule(:paren_list => "()") {
+    rule(:paren_list => '()') {
       []
     }
 
@@ -98,7 +98,7 @@ module Kalc
     }
 
     rule(:function_call => {:name => simple(:name),
-         :variable_list => sequence(:variable_list)}) {
+                            :variable_list => sequence(:variable_list)}) {
       Ast::FunctionCall.new(name, variable_list)
     }
 
@@ -107,8 +107,8 @@ module Kalc
     }
 
     rule(:function_definition => {:name => simple(:name),
-         :argument_list => sequence(:argument_list),
-         :body => simple(:body)}) {
+                                  :argument_list => sequence(:argument_list),
+                                  :body => simple(:body)}) {
       Ast::FunctionDefinition.new(name, argument_list, body)
     }
   end

data/lib/kalc/version.rb

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

data/spec/grammar_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe Kalc::Grammar do
   let(:grammar) { Kalc::Grammar.new }
 
-  context "integers" do
+  context 'integers' do
     1.upto(10) do |i|
       it { grammar.should parse("#{i}") }
     end
   end
 
-  context "floats" do
+  context 'floats' do
     1.upto(10) do |i|
       1.upto(10) do |n|
         it { grammar.should parse("#{i}.#{n}") }
@@ -17,7 +17,7 @@ describe Kalc::Grammar do
     end
   end
 
-  context "basic integer math" do
+  context 'basic integer math' do
     1.upto(10) do |i|
       it { grammar.should parse("#{i} - #{i}") }
       it { grammar.should parse("#{i} + #{i}") }
@@ -27,7 +27,7 @@ describe Kalc::Grammar do
     end
   end
 
-  context "basic float math" do
+  context 'basic float math' do
     1.upto(10) do |i|
       1.upto(10) do |n|
         it { grammar.should parse("#{i}.#{n} - #{i}.#{n}") }
@@ -39,71 +39,71 @@ describe Kalc::Grammar do
     end
   end
 
-  context "Logical expressions" do
-    it { grammar.should parse("3 && 1") }
-    it { grammar.should_not parse("&& 1") }
+  context 'Logical expressions' do
+    it { grammar.should parse('3 && 1') }
+    it { grammar.should_not parse('&& 1') }
 
-    it { grammar.should parse("3 || 1") }
-    it { grammar.should_not parse("|| 1") }
+    it { grammar.should parse('3 || 1') }
+    it { grammar.should_not parse('|| 1') }
   end
 
-  context "Comparison expressions" do
-    it { grammar.should parse("3 > 1") }
-    it { grammar.should parse("3 < 1") }
-    it { grammar.should parse("3 >= 1") }
-    it { grammar.should parse("3 <= 1") }
+  context 'Comparison expressions' do
+    it { grammar.should parse('3 > 1') }
+    it { grammar.should parse('3 < 1') }
+    it { grammar.should parse('3 >= 1') }
+    it { grammar.should parse('3 <= 1') }
 
-    it { grammar.should_not parse("> 1") }
-    it { grammar.should_not parse("< 1") }
-    it { grammar.should_not parse(">= 1") }
-    it { grammar.should_not parse("<= 1") }
+    it { grammar.should_not parse('> 1') }
+    it { grammar.should_not parse('< 1') }
+    it { grammar.should_not parse('>= 1') }
+    it { grammar.should_not parse('<= 1') }
   end
 
-  context "Equality" do
-    it { grammar.should parse("3 == 1") }
-    it { grammar.should parse("2 != 1") }
+  context 'Equality' do
+    it { grammar.should parse('3 == 1') }
+    it { grammar.should parse('2 != 1') }
   end
 
-  context "Block" do
-    it { grammar.should parse("(2 + 1)") }
-    it { grammar.should parse("(2 + 1) + 1") }
-    it { grammar.should parse("(2 + 1) * (1 / 2) + 3") }
-    it { grammar.should parse("(2 + 1) + (1 + 2) + ((3 + 2) / (2 + 1)) * 9") }
-    it { grammar.should parse("(2 + 1) - (1)") }
-    it { grammar.should parse("(2 ) + (  1)") }
-    it { grammar.should parse("((2) + (    1 ))") }
+  context 'Block' do
+    it { grammar.should parse('(2 + 1)') }
+    it { grammar.should parse('(2 + 1) + 1') }
+    it { grammar.should parse('(2 + 1) * (1 / 2) + 3') }
+    it { grammar.should parse('(2 + 1) + (1 + 2) + ((3 + 2) / (2 + 1)) * 9') }
+    it { grammar.should parse('(2 + 1) - (1)') }
+    it { grammar.should parse('(2 ) + (  1)') }
+    it { grammar.should parse('((2) + (    1 ))') }
   end
 
-  context "Ternary expressions" do
-    it { grammar.should parse("3 > 2 ? 1 : 5") }
-    it { grammar.should parse("3 > 2 || 4 <= 5 ? 1 : 5") }
-    it { grammar.should parse("(3 > (2 + 4)) ? 1 : 5") }
-    it { grammar.should parse("IF(2 > 3, 3 > 2 ? 1 : 5, 7)") }
-    it { grammar.should parse("3 > 2 ? 1 : 5 > 4 ? 7 : 5") }
+  context 'Ternary expressions' do
+    it { grammar.should parse('3 > 2 ? 1 : 5') }
+    it { grammar.should parse('3 > 2 || 4 <= 5 ? 1 : 5') }
+    it { grammar.should parse('(3 > (2 + 4)) ? 1 : 5') }
+    it { grammar.should parse('IF(2 > 3, 3 > 2 ? 1 : 5, 7)') }
+    it { grammar.should parse('3 > 2 ? 1 : 5 > 4 ? 7 : 5') }
   end
 
-  context "AND statements" do
-    it { grammar.should parse("AND(1, 2, 3)") }
-    it { grammar.should parse("AND(1, 2, 3, 4, 5, 6)") }
-    it { grammar.should parse("AND(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)") }
+  context 'AND statements' do
+    it { grammar.should parse('AND(1, 2, 3)') }
+    it { grammar.should parse('AND(1, 2, 3, 4, 5, 6)') }
+    it { grammar.should parse('AND(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)') }
   end
 
-  context "OR statements" do
-    it { grammar.should parse("OR(1, 2, 3)") }
-    it { grammar.should parse("OR(1, 2, 3, 4, 5, 6)") }
-    it { grammar.should parse("OR(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)") }
+  context 'OR statements' do
+    it { grammar.should parse('OR(1, 2, 3)') }
+    it { grammar.should parse('OR(1, 2, 3, 4, 5, 6)') }
+    it { grammar.should parse('OR(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)') }
   end
 
-  context "IF statements" do
-    it { grammar.should parse("IF(3, 2, 1)") }
-    it { grammar.should parse("IF(3 > 1, 2, 1)") }
-    it { grammar.should parse("IF((3 > 1) || (2 < 1), 2, 1)") }
-    it { grammar.should parse("IF(OR(1 > 3, 2 < 5), 3, 2)") }
+  context 'IF statements' do
+    it { grammar.should parse('IF(3, 2, 1)') }
+    it { grammar.should parse('IF(3 > 1, 2, 1)') }
+    it { grammar.should parse('IF((3 > 1) || (2 < 1), 2, 1)') }
+    it { grammar.should parse('IF(OR(1 > 3, 2 < 5), 3, 2)') }
   end
 
-  context "Nested IF statements" do
-    it { grammar.should parse("IF(3 > 2, IF(2 < 3, 1, 3), 5)") }
-    it { grammar.should parse("IF(3 > 2, IF(2 < 3, 1, 3), IF(5 > 1, 3, 9))") }
+  context 'Nested IF statements' do
+    it { grammar.should parse('IF(3 > 2, IF(2 < 3, 1, 3), 5)') }
+    it { grammar.should parse('IF(3 > 2, IF(2 < 3, 1, 3), IF(5 > 1, 3, 9))') }
   end
 
 end