dentaku 0.2.6 → 0.2.7

data/lib/dentaku/evaluator.rb

@@ -36,8 +36,8 @@ module Dentaku
     P_COMBINE    = [T_LOGICAL, T_COMBINATOR,     T_LOGICAL]
 
     P_IF         = [T_IF, T_OPEN, T_NON_GROUP, T_COMMA, T_NON_GROUP, T_COMMA, T_NON_GROUP, T_CLOSE]
-    P_ROUND_ONE  = [T_ROUND, T_OPEN, T_NUMERIC, T_CLOSE]
-    P_ROUND_TWO  = [T_ROUND, T_OPEN, T_NUMERIC, T_COMMA, T_NUMERIC, T_CLOSE]
+    P_ROUND_ONE  = [T_ROUND, T_OPEN, T_NON_GROUP_STAR, T_CLOSE]
+    P_ROUND_TWO  = [T_ROUND, T_OPEN, T_NON_GROUP_STAR, T_COMMA, T_NUMERIC, T_CLOSE]
     P_NOT        = [T_NOT, T_OPEN, T_NON_GROUP_STAR, T_CLOSE]
 
     RULES = [
@@ -152,18 +152,18 @@ module Dentaku
     end
 
     def round(*args)
-      function = args.shift
-      open     = args.shift
-      input    = args.shift.value
-      places   = 0
-
-      if args.length > 1
-        comma  = args.shift
-        places = args.shift.value
+      _, _, *tokens, _ = args
+
+      input_tokens = tokens.take_while { |a| a.category != :grouping }
+      input_value  = evaluate_token_stream(input_tokens).value
+      places       = 0
+
+      if places_token = tokens.drop_while { |a| a.category != :grouping }.last
+        places = places_token.value
       end
 
       begin
-        value = input.round(places)
+        value = input_value.round(places)
       rescue ArgumentError
         value = (input * 10 ** places).round / (10 ** places).to_f
       end

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

data/spec/evaluator_spec.rb

@@ -55,6 +55,12 @@ describe Dentaku::Evaluator do
       end
     end
 
+    describe 'functions' do
+      it 'should evaluate function' do
+        evaluator.evaluate(token_stream(:round, :open, 5, :divide, 3.0, :close)).should eq 2
+      end
+    end
+
     describe 'logic' do
       it 'should evaluate conditional' do
         evaluator.evaluate(token_stream(5, :gt, 1)).should be_true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70134892086100 !ruby/object:Gem::Requirement
+  requirement: &70128193331500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70134892086100
+  version_requirements: *70128193331500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70134892085420 !ruby/object:Gem::Requirement
+  requirement: &70128193330880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70134892085420
+  version_requirements: *70128193330880
 description: ! '    Dentaku is a parser and evaluator for mathematical formulas
 
 '