kalc 0.4 → 0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/kalc.gemspec CHANGED
@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
21
21
  # specify any dependencies here; for example:
22
22
  s.add_development_dependency "rake"
23
23
  s.add_development_dependency "rspec"
24
- s.add_runtime_dependency "parslet", "~> 1.2"
24
+ s.add_runtime_dependency "parslet", "~> 1.3"
25
25
  end
data/lib/kalc/grammar.rb CHANGED
@@ -165,7 +165,7 @@ class Kalc::Grammar < Parslet::Parser
165
165
 
166
166
  # 1 * 2
167
167
  rule(:multiplicative_expression) {
168
- function_call_expression.as(:left) >>
168
+ function_call_expression.as(:left) >>
169
169
  (power_of | multiply | divide | modulus) >>
170
170
  multiplicative_expression.as(:right) |
171
171
  function_call_expression
@@ -29,6 +29,18 @@ module Kalc
29
29
  Ast::FloatingPointNumber.new(number)
30
30
  }
31
31
 
32
+ rule(:left => subtree(:tree)) {
33
+ tree
34
+ }
35
+
36
+ rule(:right => subtree(:tree)) {
37
+ tree
38
+ }
39
+
40
+ rule(:line => subtree(:tree)) {
41
+ tree
42
+ }
43
+
32
44
  rule(:left => simple(:left), :right => simple(:right), :operator => simple(:operator)) {
33
45
  Ast::Arithmetic.new(left, right, operator)
34
46
  }
data/lib/kalc/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Kalc
2
- VERSION = "0.4"
2
+ VERSION = "0.5"
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.4'
4
+ version: '0.5'
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-03-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
16
- requirement: &70227178471520 !ruby/object:Gem::Requirement
16
+ requirement: &70142802434300 !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: *70227178471520
24
+ version_requirements: *70142802434300
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: rspec
27
- requirement: &70227178471100 !ruby/object:Gem::Requirement
27
+ requirement: &70142802433760 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,18 +32,18 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70227178471100
35
+ version_requirements: *70142802433760
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: parslet
38
- requirement: &70227178470600 !ruby/object:Gem::Requirement
38
+ requirement: &70142802433140 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
42
42
  - !ruby/object:Gem::Version
43
- version: '1.2'
43
+ version: '1.3'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70227178470600
46
+ version_requirements: *70142802433140
47
47
  description: Calculation language slightly based on Excel's formula language.
48
48
  email:
49
49
  - mrcsparker@gmail.com