soroban 0.8.0 → 0.9.0

data/Soroban.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "soroban"
-  s.version = "0.8.0"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Hutchens"]
-  s.date = "2014-03-25"
+  s.date = "2014-10-22"
   s.description = "Soroban makes it easy to extract and execute formulas from Excel spreadsheets. It rewrites Excel formulas as Ruby expressions, and allows you to bind named variables to spreadsheet cells to easily manipulate inputs and capture outputs."
   s.email = "jason.hutchens@agworld.com.au"
   s.extra_rdoc_files = [

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.9.0

data/lib/soroban/parser/grammar.rb

@@ -2,6 +2,7 @@
 
 
 module Soroban
+
   module Excel
     include Treetop::Runtime
 
@@ -1393,6 +1394,9 @@ module Soroban
     module Identifier0
     end
 
+    module Identifier1
+    end
+
     def _nt_identifier
       start_index = index
       if node_cache[:identifier].has_key?(index)
@@ -1404,38 +1408,125 @@ module Soroban
         return cached
       end
 
-      i0, s0 = index, []
+      i0 = index
+      i1, s1 = index, []
       if has_terminal?('\G[a-zA-Z]', true, index)
-        r1 = true
+        r2 = true
         @index += 1
       else
-        r1 = nil
+        r2 = nil
       end
-      s0 << r1
-      if r1
-        s2, i2 = [], index
+      s1 << r2
+      if r2
+        s3, i3 = [], index
         loop do
           if has_terminal?('\G[a-zA-Z0-9]', true, index)
-            r3 = true
+            r4 = true
             @index += 1
           else
-            r3 = nil
+            r4 = nil
           end
-          if r3
-            s2 << r3
+          if r4
+            s3 << r4
           else
             break
           end
         end
-        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-        s0 << r2
+        r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+        s1 << r3
       end
-      if s0.last
-        r0 = instantiate_node(Identifier,input, i0...index, s0)
-        r0.extend(Identifier0)
+      if s1.last
+        r1 = instantiate_node(Identifier,input, i1...index, s1)
+        r1.extend(Identifier0)
       else
-        @index = i0
-        r0 = nil
+        @index = i1
+        r1 = nil
+      end
+      if r1
+        r0 = r1
+      else
+        i5, s5 = index, []
+        if has_terminal?('$', false, index)
+          r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('$')
+          r6 = nil
+        end
+        s5 << r6
+        if r6
+          s7, i7 = [], index
+          loop do
+            if has_terminal?('\G[A-Za-z]', true, index)
+              r8 = true
+              @index += 1
+            else
+              r8 = nil
+            end
+            if r8
+              s7 << r8
+            else
+              break
+            end
+          end
+          if s7.empty?
+            @index = i7
+            r7 = nil
+          else
+            r7 = instantiate_node(SyntaxNode,input, i7...index, s7)
+          end
+          s5 << r7
+          if r7
+            if has_terminal?('$', false, index)
+              r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure('$')
+              r9 = nil
+            end
+            s5 << r9
+            if r9
+              if has_terminal?('\G[1-9]', true, index)
+                r10 = true
+                @index += 1
+              else
+                r10 = nil
+              end
+              s5 << r10
+              if r10
+                s11, i11 = [], index
+                loop do
+                  if has_terminal?('\G[0-9]', true, index)
+                    r12 = true
+                    @index += 1
+                  else
+                    r12 = nil
+                  end
+                  if r12
+                    s11 << r12
+                  else
+                    break
+                  end
+                end
+                r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+                s5 << r11
+              end
+            end
+          end
+        end
+        if s5.last
+          r5 = instantiate_node(Identifier,input, i5...index, s5)
+          r5.extend(Identifier1)
+        else
+          @index = i5
+          r5 = nil
+        end
+        if r5
+          r0 = r5
+        else
+          @index = i0
+          r0 = nil
+        end
       end
 
       node_cache[:identifier][start_index] = r0
@@ -1873,4 +1964,5 @@ module Soroban
     include Excel
   end
 
+
 end

data/lib/soroban/parser/grammar.treetop

@@ -53,7 +53,7 @@ module Soroban
       [0-9]+ <IntegerValue>
     end
     rule identifier
-      [a-zA-Z] [a-zA-Z0-9]* <Identifier>
+      [a-zA-Z] [a-zA-Z0-9]* <Identifier> / '$' [A-Za-z]+ '$' [1-9] [0-9]* <Identifier>
     end
     rule label
       [A-Za-z]+ [1-9] [0-9]* <Label> / '$' [A-Za-z]+ '$' [1-9] [0-9]* <Label>

data/lib/soroban/parser/nodes.rb

@@ -9,10 +9,10 @@ module Soroban
 
     class Identifier < Treetop::Runtime::SyntaxNode
       def rewrite_ruby(value)
-        "@#{value}.get"
+        "@#{value.gsub('$', '')}.get"
       end
       def extract_labels(value)
-        value.to_sym
+        value.gsub('$', '').to_sym
       end
     end
 

data/spec/soroban_spec.rb

@@ -165,4 +165,11 @@ describe "Soroban" do
     sheet.A3.should be_within(1e-6).of(0.5)
   end
 
+  it "supports absolute cell references" do
+    sheet.set(:A1 => "1")
+    sheet.set(:A2 => "2")
+    sheet.set(:A3 => "=$A$2 + $A$1")
+    sheet.A3.should eq(3)
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: soroban
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Jason Hutchens
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-25 00:00:00 Z
+date: 2014-10-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop