kalc 0.3 → 0.4

Sign up to get free protection for your applications and to get access to all the features.
@@ -95,6 +95,8 @@ module Kalc
95
95
  @left - @right
96
96
  when '+'
97
97
  @left + @right
98
+ when '^'
99
+ @left ** @right
98
100
  when '*'
99
101
  @left * @right
100
102
  when '/'
@@ -82,6 +82,7 @@ class Kalc::Grammar < Parslet::Parser
82
82
  :multiply => '*',
83
83
  :divide => '/',
84
84
  :modulus => '%',
85
+ :power_of => '^',
85
86
 
86
87
  :less => '<',
87
88
  :greater => '>'
@@ -165,7 +166,7 @@ class Kalc::Grammar < Parslet::Parser
165
166
  # 1 * 2
166
167
  rule(:multiplicative_expression) {
167
168
  function_call_expression.as(:left) >>
168
- (multiply | divide | modulus) >>
169
+ (power_of | multiply | divide | modulus) >>
169
170
  multiplicative_expression.as(:right) |
170
171
  function_call_expression
171
172
  }
@@ -1,3 +1,3 @@
1
1
  module Kalc
2
- VERSION = "0.3"
2
+ VERSION = "0.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kalc
3
3
  version: !ruby/object:Gem::Version
4
- version: '0.3'
4
+ version: '0.4'
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-06 00:00:00.000000000 Z
12
+ date: 2012-03-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
16
- requirement: &70212126361020 !ruby/object:Gem::Requirement
16
+ requirement: &70227178471520 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *70212126361020
24
+ version_requirements: *70227178471520
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rspec
27
- requirement: &70212126360600 !ruby/object:Gem::Requirement
27
+ requirement: &70227178471100 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70212126360600
35
+ version_requirements: *70227178471100
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: parslet
38
- requirement: &70212126360100 !ruby/object:Gem::Requirement
38
+ requirement: &70227178470600 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,7 +43,7 @@ dependencies:
43
43
  version: '1.2'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70212126360100
46
+ version_requirements: *70227178470600
47
47
  description: Calculation language slightly based on Excel's formula language.
48
48
  email:
49
49
  - mrcsparker@gmail.com