kalc 0.8.1 → 0.9.0

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
 gemspec

data/Gemfile.lock

@@ -1,27 +1,28 @@
 PATH
   remote: .
   specs:
-    kalc (0.8.0)
-      parslet (~> 1.4)
+    kalc (0.9.0)
+      parslet (~> 1.5)
 
 GEM
   remote: http://rubygems.org/
   specs:
     blankslate (2.1.2.4)
-    diff-lcs (1.1.3)
-    parslet (1.4.0)
+    diff-lcs (1.2.4)
+    parslet (1.5.0)
       blankslate (~> 2.0)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES

data/bin/ikalc

@@ -3,6 +3,6 @@
 kalc_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(kalc_dir) unless $LOAD_PATH.include?(kalc_dir)
 
-require "kalc"
+require 'kalc'
 
-repl = Kalc::Repl.new.run
+Kalc::Repl.new.run

data/bin/kalc

@@ -3,8 +3,8 @@
 kalc_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(kalc_dir) unless $LOAD_PATH.include?(kalc_dir)
 
-require "kalc"
-require "pp"
+require 'kalc'
+require 'pp'
 
 if ARGV.first
   input = File.read(ARGV.first)

data/kalc.gemspec

@@ -1,25 +1,25 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "kalc/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'kalc/version'
 #
 Gem::Specification.new do |s|
-  s.name        = "kalc"
-  s.version     = Kalc::VERSION
-  s.authors     = ["Chris Parker"]
-  s.email       = ["mrcsparker@gmail.com"]
-  s.homepage    = "https://github.com/mrcsparker/kalc"
-  s.summary     = %q{Small calculation language.}
+  s.name = 'kalc'
+  s.version = Kalc::VERSION
+  s.authors = ['Chris Parker']
+  s.email = %w(mrcsparker@gmail.com)
+  s.homepage = 'https://github.com/mrcsparker/kalc'
+  s.summary = %q{Small calculation language.}
   s.description = %q{Calculation language slightly based on Excel's formula language.}
 
-  s.rubyforge_project = "kalc"
+  s.rubyforge_project = 'kalc'
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = %w(lib)
 
   # specify any dependencies here; for example:
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec"
-  s.add_runtime_dependency "parslet", "~> 1.4"
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_runtime_dependency 'parslet', '~> 1.5'
 end

data/lib/kalc.rb

@@ -11,7 +11,7 @@ require 'kalc/repl'
 
 module Kalc
   class Runner
-    
+
     attr_accessor :grammar
     attr_accessor :transform
     attr_accessor :interpreter
@@ -40,13 +40,13 @@ module Kalc
 
     private
     def load_environment
-      @log.debug "Loading grammar" if @debug
+      @log.debug 'Loading grammar' if @debug
       @grammar = Kalc::Grammar.new
-      @log.debug "Loading transform" if @debug
+      @log.debug 'Loading transform' if @debug
       @transform = Kalc::Transform.new
-      @log.debug "Loading interpreter" if @debug
+      @log.debug 'Loading interpreter' if @debug
       @interpreter = Kalc::Interpreter.new
-      @log.debug "Loading stdlib" if @debug
+      @log.debug 'Loading stdlib' if @debug
       @interpreter.load_stdlib(@grammar, @transform)
     end
   end

data/lib/kalc/ast.rb

@@ -117,7 +117,7 @@ module Kalc
     class Ops
       attr_reader :left
       attr_reader :ops
-      
+
       def initialize(left, ops)
         @left = left
         @ops = ops
@@ -145,40 +145,40 @@ module Kalc
 
       def eval(context)
         case @operator.to_s.strip
-        when '&&'
-          @left && @right
-        when 'and'
-          @left && @right
-        when '||'
-          @left || @right
-        when 'or'
-          @left || @right
-        when '<='
-          @left <= @right
-        when '>='
-          @left >= @right
-        when '='
-          @left == @right
-        when '=='
-          @left == @right
-        when '!='
-          @left != @right
-        when '-'
-          @left - @right
-        when '+'
-          @left + @right
-        when '^'
-          @left ** @right
-        when '*'
-          @left * @right
-        when '/'
-          @left / @right
-        when '%'
-          @left % @right
-        when '<'
-          @left < @right
-        when '>'
-          @left > @right
+          when '&&'
+            @left && @right
+          when 'and'
+            @left && @right
+          when '||'
+            @left || @right
+          when 'or'
+            @left || @right
+          when '<='
+            @left <= @right
+          when '>='
+            @left >= @right
+          when '='
+            @left == @right
+          when '=='
+            @left == @right
+          when '!='
+            @left != @right
+          when '-'
+            @left - @right
+          when '+'
+            @left + @right
+          when '^'
+            @left ** @right
+          when '*'
+            @left * @right
+          when '/'
+            @left / @right
+          when '%'
+            @left % @right
+          when '<'
+            @left < @right
+          when '>'
+            @left > @right
         end
       end
     end
@@ -213,6 +213,7 @@ module Kalc
 
     class Variable
       attr_reader :variable
+
       def initialize(variable)
         @variable = variable
       end

data/lib/kalc/environment.rb

@@ -12,7 +12,7 @@ module Kalc
     end
 
     def add_function(name, value)
-      @functions.update({ name.to_s.strip => value })
+      @functions.update({name.to_s.strip => value})
     end
 
     def get_function(name)
@@ -26,7 +26,7 @@ module Kalc
     end
 
     def add_variable(name, value)
-      @variables.update({ name.to_s.strip => value })
+      @variables.update({name.to_s.strip => value})
       value
     end
 

data/lib/kalc/grammar.rb

@@ -22,7 +22,7 @@ class Kalc::Grammar < Parslet::Parser
   rule(:new_line) { match('[\n\r]').repeat(1) }
   rule(:separator) { str(';') >> spaces? }
 
-  def self.symbols(symbols) 
+  def self.symbols(symbols)
     symbols.each do |name, symbol|
       rule(name) { str(symbol) >> spaces? }
     end
@@ -37,21 +37,21 @@ class Kalc::Grammar < Parslet::Parser
           :question_mark => '?'
 
   def self.operators(operators={})
-    trailing_chars = Hash.new { |hash,symbol| hash[symbol] = [] }
+    trailing_chars = Hash.new { |hash, symbol| hash[symbol] = [] }
 
     operators.each_value do |symbol|
       operators.each_value do |op|
-        if op[0,symbol.length] == symbol
-          char = op[symbol.length,1]
+        if op[0, symbol.length] == symbol
+          char = op[symbol.length, 1]
 
-          unless (char.nil? || char.empty?)
+          unless char.nil? || char.empty?
             trailing_chars[symbol] << char
           end
         end
       end
     end
 
-    operators.each do |name,symbol|
+    operators.each do |name, symbol|
       trailing = trailing_chars[symbol]
 
       if trailing.empty?
@@ -101,12 +101,12 @@ class Kalc::Grammar < Parslet::Parser
   }
 
   rule(:string) {
-    str('"') >> 
-    (
-      str('\\') >> any |
-      str('"').absnt? >> any
-    ).repeat.as(:string) >> 
-    str('"')
+    str('"') >>
+        (
+        str('\\') >> any |
+            str('"').absnt? >> any
+        ).repeat.as(:string) >>
+        str('"')
   }
 
   rule(:exponent) {
@@ -116,10 +116,10 @@ class Kalc::Grammar < Parslet::Parser
   # We are using a really broad definition of what a number is.
   # Numbers can be 1, 1.0, 0.1, 1.0e4, +1.0E10, etc
   rule(:number) {
-    (match('[+-]').maybe >> 
-      (str('.') >> digits >> exponent.maybe).as(:number) >> spaces?) |
-    (match('[+-]').maybe >> 
-     digits >> (str('.') >> digits).maybe >> exponent.maybe).as(:number) >> spaces?
+    (match('[+-]').maybe >>
+        (str('.') >> digits >> exponent.maybe).as(:number) >> spaces?) |
+        (match('[+-]').maybe >>
+            digits >> (str('.') >> digits).maybe >> exponent.maybe).as(:number) >> spaces?
   }
 
   rule(:identifier) {
@@ -127,11 +127,11 @@ class Kalc::Grammar < Parslet::Parser
   }
 
   rule(:quoted_identifier) {
-    str("'") >> 
-    (
-      str('\\') >> any  | str("'").absnt? >> any
-    ).repeat(1) >>
-    str("'") >> spaces?
+    str("'") >>
+        (
+        str('\\') >> any | str("'").absnt? >> any
+        ).repeat(1) >>
+        str("'") >> spaces?
   }
 
   rule(:argument) {
@@ -176,31 +176,31 @@ class Kalc::Grammar < Parslet::Parser
   }
 
   rule(:non_ops_expression) {
-    (atom.as(:left) >> 
-      power_of >>
-      atom.as(:right)).as(:non_ops) | atom
+    (atom.as(:left) >>
+        power_of >>
+        atom.as(:right)).as(:non_ops) | atom
   }
 
   # IF(1, 2, 3)
   # AND(1, 2, ...)
   rule(:function_call_expression) {
     (identifier.as(:name) >> paren_variable_list.as(:variable_list)).as(:function_call) |
-    (str('+') >> non_ops_expression).as(:positive) |
-    (str('-') >> non_ops_expression).as(:negative) | non_ops_expression
+        (str('+') >> non_ops_expression).as(:positive) |
+        (str('-') >> non_ops_expression).as(:negative) | non_ops_expression
   }
 
   # 1 + 2
   rule(:additive_expression) {
-    multiplicative_expression.as(:left) >> 
-      ((add | subtract) >> 
-        multiplicative_expression.as(:right)).repeat.as(:ops)
+    multiplicative_expression.as(:left) >>
+        ((add | subtract) >>
+            multiplicative_expression.as(:right)).repeat.as(:ops)
   }
 
   # 1 * 2
   rule(:multiplicative_expression) {
-    function_call_expression.as(:left) >> 
-      ((multiply | divide | modulus) >> 
-        function_call_expression.as(:right)).repeat.as(:ops)
+    function_call_expression.as(:left) >>
+        ((multiply | divide | modulus) >>
+            function_call_expression.as(:right)).repeat.as(:ops)
   }
 
   # 1 < 2
@@ -208,49 +208,49 @@ class Kalc::Grammar < Parslet::Parser
   # 1 <= 2
   # 1 >= 2
   rule(:relational_expression) {
-    additive_expression.as(:left) >> 
-      ((less | greater | less_equal | greater_equal) >>
-        relational_expression.as(:right)).repeat.as(:ops)
+    additive_expression.as(:left) >>
+        ((less | greater | less_equal | greater_equal) >>
+            relational_expression.as(:right)).repeat.as(:ops)
   }
 
   # 1 = 2
   rule(:equality_expression) {
     relational_expression.as(:left) >>
-      ((excel_equal | equal | not_equal) >>
-        equality_expression.as(:right)).repeat.as(:ops)
+        ((excel_equal | equal | not_equal) >>
+            equality_expression.as(:right)).repeat.as(:ops)
   }
 
   # 1 && 2
   rule(:logical_and_expression) {
     equality_expression.as(:left) >>
-      ((logical_and | string_and) >>
-        logical_and_expression.as(:right)).repeat.as(:ops)
+        ((logical_and | string_and) >>
+            logical_and_expression.as(:right)).repeat.as(:ops)
   }
 
   # 1 || 2
   rule(:logical_or_expression) {
     logical_and_expression.as(:left) >>
-      ((logical_or | string_or) >>
-        logical_or_expression.as(:right)).repeat.as(:ops)
+        ((logical_or | string_or) >>
+            logical_or_expression.as(:right)).repeat.as(:ops)
   }
 
   # 1 > 2 ? 3 : 4
   rule(:conditional_expression) {
-    logical_or_expression.as(:condition) >> 
-      (question_mark >> 
-        conditional_expression.as(:true_cond) >> 
-        colon >> 
-        conditional_expression.as(:false_cond)).maybe
+    logical_or_expression.as(:condition) >>
+        (question_mark >>
+            conditional_expression.as(:true_cond) >>
+            colon >>
+            conditional_expression.as(:false_cond)).maybe
   }
 
   # 'a' = 1
   # We don't allow for nested assignments:
   # IF('a' = 1, 1, 2)
   rule(:assignment_expression) {
-    (variable.as(:identifier) >> 
-      assign >> 
-      assignment_expression.as(:value)).as(:assign) |
-    conditional_expression
+    (variable.as(:identifier) >>
+        assign >>
+        assignment_expression.as(:value)).as(:assign) |
+        conditional_expression
   }
 
   rule(:expression) {
@@ -267,9 +267,9 @@ class Kalc::Grammar < Parslet::Parser
 
   rule(:function_definition_expression) {
     (str('DEFINE') >> spaces? >> identifier.as(:name) >>
-         paren_argument_list.as(:argument_list) >>
-         left_brace >> function_body.as(:body) >> right_brace).as(:function_definition) |
-    expressions.as(:expressions)
+        paren_argument_list.as(:argument_list) >>
+        left_brace >> function_body.as(:body) >> right_brace).as(:function_definition) |
+        expressions.as(:expressions)
   }
 
   rule(:function_definition_expressions) {