exalted_math 0.1.2 → 0.1.3

data/Rakefile

@@ -29,3 +29,9 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
+file 'lib/exalted_math/math.rb' => 'lib/exalted_math/math.treetop' do
+  sh "tt lib/exalted_math/math.treetop"
+end
+
+desc "Regenerate the treetop file"
+task :treetop => 'lib/exalted_math/math.rb'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/exalted_math.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exalted_math}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonathan Stott"]
-  s.date = %q{2010-06-06}
+  s.date = %q{2010-06-09}
   s.description = %q{Parsing and evaluation of simple maths expressions for Exalted
 
 This intended to aid in evaluating simple calculations which appear on character sheets, especially for Exalted.}

data/lib/exalted_math.rb

@@ -1,13 +1,16 @@
 #!/usr/bin/ruby
 # Jonathan D. Stott <jonathan.stott@gmail.com>
-require 'treetop'
+require 'treetop/runtime'
 require 'exalted_math/math'
 require 'exalted_math/ast'
 
 module Exalted
   class MathsParser
     def ast(text)
-      result = parse(text)
+      txt = text.dup
+      txt.strip!
+      txt.gsub!(/\s+/," ")
+      result = parse(txt)
       if result
         [true, result.ast]
       else

data/lib/exalted_math/math.rb

@@ -14,8 +14,12 @@ module Maths
       elements[0]
     end
 
+    def space
+      elements[2]
+    end
+
     def additive
-      elements[4]
+      elements[3]
     end
   end
 
@@ -30,8 +34,12 @@ module Maths
       elements[0]
     end
 
+    def space
+      elements[2]
+    end
+
     def additive
-      elements[4]
+      elements[3]
     end
   end
 
@@ -57,42 +65,20 @@ module Maths
     r2 = _nt_multitive
     s1 << r2
     if r2
-      s3, i3 = [], index
-      loop do
-        r4 = _nt_space
-        if r4
-          s3 << r4
-        else
-          break
-        end
+      if has_terminal?('+', false, index)
+        r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
+      else
+        terminal_parse_failure('+')
+        r3 = nil
       end
-      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
       s1 << r3
       if r3
-        if has_terminal?('+', false, index)
-          r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
-        else
-          terminal_parse_failure('+')
-          r5 = nil
-        end
-        s1 << r5
-        if r5
-          s6, i6 = [], index
-          loop do
-            r7 = _nt_space
-            if r7
-              s6 << r7
-            else
-              break
-            end
-          end
-          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-          s1 << r6
-          if r6
-            r8 = _nt_additive
-            s1 << r8
-          end
+        r4 = _nt_space
+        s1 << r4
+        if r4
+          r5 = _nt_additive
+          s1 << r5
         end
       end
     end
@@ -107,63 +93,41 @@ module Maths
     if r1
       r0 = r1
     else
-      i9, s9 = index, []
-      r10 = _nt_multitive
-      s9 << r10
-      if r10
-        s11, i11 = [], index
-        loop do
-          r12 = _nt_space
-          if r12
-            s11 << r12
-          else
-            break
-          end
+      i6, s6 = index, []
+      r7 = _nt_multitive
+      s6 << r7
+      if r7
+        if has_terminal?('-', false, index)
+          r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('-')
+          r8 = nil
         end
-        r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
-        s9 << r11
-        if r11
-          if has_terminal?('-', false, index)
-            r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
-          else
-            terminal_parse_failure('-')
-            r13 = nil
-          end
-          s9 << r13
-          if r13
-            s14, i14 = [], index
-            loop do
-              r15 = _nt_space
-              if r15
-                s14 << r15
-              else
-                break
-              end
-            end
-            r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
-            s9 << r14
-            if r14
-              r16 = _nt_additive
-              s9 << r16
-            end
+        s6 << r8
+        if r8
+          r9 = _nt_space
+          s6 << r9
+          if r9
+            r10 = _nt_additive
+            s6 << r10
           end
         end
       end
-      if s9.last
-        r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-        r9.extend(Additive2)
-        r9.extend(Additive3)
+      if s6.last
+        r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+        r6.extend(Additive2)
+        r6.extend(Additive3)
       else
-        @index = i9
-        r9 = nil
+        @index = i6
+        r6 = nil
       end
-      if r9
-        r0 = r9
+      if r6
+        r0 = r6
       else
-        r17 = _nt_multitive
-        if r17
-          r0 = r17
+        r11 = _nt_multitive
+        if r11
+          r0 = r11
         else
           @index = i0
           r0 = nil
@@ -181,8 +145,12 @@ module Maths
       elements[0]
     end
 
+    def space
+      elements[2]
+    end
+
     def multitive
-      elements[4]
+      elements[3]
     end
   end
 
@@ -197,8 +165,12 @@ module Maths
       elements[0]
     end
 
+    def space
+      elements[2]
+    end
+
     def multitive
-      elements[4]
+      elements[3]
     end
   end
 
@@ -224,42 +196,20 @@ module Maths
     r2 = _nt_primary
     s1 << r2
     if r2
-      s3, i3 = [], index
-      loop do
-        r4 = _nt_space
-        if r4
-          s3 << r4
-        else
-          break
-        end
+      if has_terminal?('*', false, index)
+        r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
+      else
+        terminal_parse_failure('*')
+        r3 = nil
       end
-      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
       s1 << r3
       if r3
-        if has_terminal?('*', false, index)
-          r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
-        else
-          terminal_parse_failure('*')
-          r5 = nil
-        end
-        s1 << r5
-        if r5
-          s6, i6 = [], index
-          loop do
-            r7 = _nt_space
-            if r7
-              s6 << r7
-            else
-              break
-            end
-          end
-          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-          s1 << r6
-          if r6
-            r8 = _nt_multitive
-            s1 << r8
-          end
+        r4 = _nt_space
+        s1 << r4
+        if r4
+          r5 = _nt_multitive
+          s1 << r5
         end
       end
     end
@@ -274,63 +224,41 @@ module Maths
     if r1
       r0 = r1
     else
-      i9, s9 = index, []
-      r10 = _nt_primary
-      s9 << r10
-      if r10
-        s11, i11 = [], index
-        loop do
-          r12 = _nt_space
-          if r12
-            s11 << r12
-          else
-            break
-          end
+      i6, s6 = index, []
+      r7 = _nt_primary
+      s6 << r7
+      if r7
+        if has_terminal?('/', false, index)
+          r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('/')
+          r8 = nil
         end
-        r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
-        s9 << r11
-        if r11
-          if has_terminal?('/', false, index)
-            r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
-            @index += 1
-          else
-            terminal_parse_failure('/')
-            r13 = nil
-          end
-          s9 << r13
-          if r13
-            s14, i14 = [], index
-            loop do
-              r15 = _nt_space
-              if r15
-                s14 << r15
-              else
-                break
-              end
-            end
-            r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
-            s9 << r14
-            if r14
-              r16 = _nt_multitive
-              s9 << r16
-            end
+        s6 << r8
+        if r8
+          r9 = _nt_space
+          s6 << r9
+          if r9
+            r10 = _nt_multitive
+            s6 << r10
           end
         end
       end
-      if s9.last
-        r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-        r9.extend(Multitive2)
-        r9.extend(Multitive3)
+      if s6.last
+        r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+        r6.extend(Multitive2)
+        r6.extend(Multitive3)
       else
-        @index = i9
-        r9 = nil
+        @index = i6
+        r6 = nil
       end
-      if r9
-        r0 = r9
+      if r6
+        r0 = r6
       else
-        r17 = _nt_primary
-        if r17
-          r0 = r17
+        r11 = _nt_primary
+        if r11
+          r0 = r11
         else
           @index = i0
           r0 = nil
@@ -344,10 +272,17 @@ module Maths
   end
 
   module Primary0
+    def space1
+      elements[1]
+    end
+
     def additive
       elements[2]
     end
 
+    def space2
+      elements[4]
+    end
   end
 
   module Primary1
@@ -378,41 +313,23 @@ module Maths
     end
     s1 << r2
     if r2
-      s3, i3 = [], index
-      loop do
-        r4 = _nt_space
-        if r4
-          s3 << r4
-        else
-          break
-        end
-      end
-      r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+      r3 = _nt_space
       s1 << r3
       if r3
-        r5 = _nt_additive
-        s1 << r5
-        if r5
-          s6, i6 = [], index
-          loop do
-            r7 = _nt_space
-            if r7
-              s6 << r7
-            else
-              break
-            end
+        r4 = _nt_additive
+        s1 << r4
+        if r4
+          if has_terminal?(')', false, index)
+            r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure(')')
+            r5 = nil
           end
-          r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-          s1 << r6
-          if r6
-            if has_terminal?(')', false, index)
-              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
-              @index += 1
-            else
-              terminal_parse_failure(')')
-              r8 = nil
-            end
-            s1 << r8
+          s1 << r5
+          if r5
+            r6 = _nt_space
+            s1 << r6
           end
         end
       end
@@ -428,25 +345,25 @@ module Maths
     if r1
       r0 = r1
     else
-      r9 = _nt_number
-      if r9
-        r0 = r9
+      r7 = _nt_number
+      if r7
+        r0 = r7
       else
-        r10 = _nt_spec
-        if r10
-          r0 = r10
+        r8 = _nt_spec
+        if r8
+          r0 = r8
         else
-          r11 = _nt_max
-          if r11
-            r0 = r11
+          r9 = _nt_max
+          if r9
+            r0 = r9
           else
-            r12 = _nt_min
-            if r12
-              r0 = r12
+            r10 = _nt_min
+            if r10
+              r0 = r10
             else
-              r13 = _nt_stat
-              if r13
-                r0 = r13
+              r11 = _nt_stat
+              if r11
+                r0 = r11
               else
                 @index = i0
                 r0 = nil
@@ -467,6 +384,9 @@ module Maths
       elements[4]
     end
 
+    def space
+      elements[6]
+    end
   end
 
   module Spec1
@@ -561,6 +481,10 @@ module Maths
                 r8 = nil
               end
               s0 << r8
+              if r8
+                r9 = _nt_space
+                s0 << r9
+              end
             end
           end
         end
@@ -593,7 +517,7 @@ module Maths
     end
 
     def list
-      elements[4]
+      elements[3]
     end
 
   end
@@ -697,43 +621,17 @@ module Maths
         end
         s0 << r9
         if r9
-          s10, i10 = [], index
-          loop do
-            r11 = _nt_space
-            if r11
-              s10 << r11
-            else
-              break
-            end
-          end
-          r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
+          r10 = _nt_list
           s0 << r10
           if r10
-            r12 = _nt_list
-            s0 << r12
-            if r12
-              s13, i13 = [], index
-              loop do
-                r14 = _nt_space
-                if r14
-                  s13 << r14
-                else
-                  break
-                end
-              end
-              r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
-              s0 << r13
-              if r13
-                if has_terminal?(')', false, index)
-                  r15 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
-                else
-                  terminal_parse_failure(')')
-                  r15 = nil
-                end
-                s0 << r15
-              end
+            if has_terminal?(')', false, index)
+              r11 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure(')')
+              r11 = nil
             end
+            s0 << r11
           end
         end
       end
@@ -765,7 +663,7 @@ module Maths
     end
 
     def list
-      elements[4]
+      elements[3]
     end
 
   end
@@ -868,43 +766,17 @@ module Maths
         end
         s0 << r9
         if r9
-          s10, i10 = [], index
-          loop do
-            r11 = _nt_space
-            if r11
-              s10 << r11
-            else
-              break
-            end
-          end
-          r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
+          r10 = _nt_list
           s0 << r10
           if r10
-            r12 = _nt_list
-            s0 << r12
-            if r12
-              s13, i13 = [], index
-              loop do
-                r14 = _nt_space
-                if r14
-                  s13 << r14
-                else
-                  break
-                end
-              end
-              r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
-              s0 << r13
-              if r13
-                if has_terminal?(')', false, index)
-                  r15 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
-                else
-                  terminal_parse_failure(')')
-                  r15 = nil
-                end
-                s0 << r15
-              end
+            if has_terminal?(')', false, index)
+              r11 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure(')')
+              r11 = nil
             end
+            s0 << r11
           end
         end
       end
@@ -924,9 +796,17 @@ module Maths
   end
 
   module List0
+    def space
+      elements[1]
+    end
+
   end
 
   module List1
+    def space
+      elements[0]
+    end
+
   end
 
   module List2
@@ -957,101 +837,70 @@ module Maths
     end
 
     i0, s0 = index, []
-    s1, i1 = [], index
-    loop do
-      i2, s2 = index, []
-      i3 = index
-      r4 = _nt_number
-      if r4
-        r3 = r4
+    r1 = _nt_space
+    s0 << r1
+    if r1
+      i2 = index
+      r3 = _nt_number
+      if r3
+        r2 = r3
       else
-        r5 = _nt_stat
-        if r5
-          r3 = r5
+        r4 = _nt_stat
+        if r4
+          r2 = r4
         else
-          @index = i3
-          r3 = nil
+          @index = i2
+          r2 = nil
         end
       end
-      s2 << r3
-      if r3
-        s6, i6 = [], index
+      s0 << r2
+      if r2
+        s5, i5 = [], index
         loop do
-          r7 = _nt_space
-          if r7
-            s6 << r7
-          else
-            break
-          end
-        end
-        r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-        s2 << r6
-        if r6
+          i6, s6 = index, []
           if has_terminal?(',', false, index)
-            r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             terminal_parse_failure(',')
-            r8 = nil
+            r7 = nil
           end
-          s2 << r8
-          if r8
-            s9, i9 = [], index
-            loop do
-              r10 = _nt_space
+          s6 << r7
+          if r7
+            r8 = _nt_space
+            s6 << r8
+            if r8
+              i9 = index
+              r10 = _nt_number
               if r10
-                s9 << r10
+                r9 = r10
               else
-                break
+                r11 = _nt_stat
+                if r11
+                  r9 = r11
+                else
+                  @index = i9
+                  r9 = nil
+                end
               end
+              s6 << r9
             end
-            r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-            s2 << r9
           end
-        end
-      end
-      if s2.last
-        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-        r2.extend(List0)
-      else
-        @index = i2
-        r2 = nil
-      end
-      if r2
-        s1 << r2
-      else
-        break
-      end
-    end
-    r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-    s0 << r1
-    if r1
-      s11, i11 = [], index
-      loop do
-        r12 = _nt_space
-        if r12
-          s11 << r12
-        else
-          break
-        end
-      end
-      r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
-      s0 << r11
-      if r11
-        i13 = index
-        r14 = _nt_number
-        if r14
-          r13 = r14
-        else
-          r15 = _nt_stat
-          if r15
-            r13 = r15
+          if s6.last
+            r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+            r6.extend(List0)
+          else
+            @index = i6
+            r6 = nil
+          end
+          if r6
+            s5 << r6
           else
-            @index = i13
-            r13 = nil
+            break
           end
         end
-        s0 << r13
+        r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+        s0 << r5
       end
     end
     if s0.last
@@ -1079,44 +928,17 @@ module Maths
       return cached
     end
 
-    s0, i0 = [], index
-    loop do
-      i1 = index
-      if has_terminal?(" ", false, index)
-        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-        @index += 1
-      else
-        terminal_parse_failure(" ")
-        r2 = nil
-      end
-      if r2
-        r1 = r2
-      else
-        if has_terminal?("\t", false, index)
-          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
-        else
-          terminal_parse_failure("\t")
-          r3 = nil
-        end
-        if r3
-          r1 = r3
-        else
-          @index = i1
-          r1 = nil
-        end
-      end
-      if r1
-        s0 << r1
-      else
-        break
-      end
+    if has_terminal?(" ", false, index)
+      r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+      @index += 1
+    else
+      terminal_parse_failure(" ")
+      r1 = nil
     end
-    if s0.empty?
-      @index = i0
-      r0 = nil
+    if r1
+      r0 = r1
     else
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0 = instantiate_node(SyntaxNode,input, index...index)
     end
 
     node_cache[:space][start_index] = r0
@@ -1129,6 +951,9 @@ module Maths
       elements[0]
     end
 
+    def space
+      elements[3]
+    end
   end
 
   module Number1
@@ -1194,6 +1019,10 @@ module Maths
         end
         r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
         s0 << r4
+        if r4
+          r6 = _nt_space
+          s0 << r6
+        end
       end
     end
     if s0.last
@@ -1211,8 +1040,18 @@ module Maths
   end
 
   module Stat0
+    def statistic
+      elements[0]
+    end
+
+    def space
+      elements[1]
+    end
+  end
+
+  module Stat1
     def value
-      text_value.downcase
+      statistic.text_value.downcase
     end
     def ast
       Ast.stat(value)
@@ -1230,26 +1069,39 @@ module Maths
       return cached
     end
 
-    s0, i0 = [], index
+    i0, s0 = index, []
+    s1, i1 = [], index
     loop do
       if has_terminal?('\G[A-Za-z]', true, index)
-        r1 = true
+        r2 = true
         @index += 1
       else
-        r1 = nil
+        r2 = nil
       end
-      if r1
-        s0 << r1
+      if r2
+        s1 << r2
       else
         break
       end
     end
-    if s0.empty?
-      @index = i0
-      r0 = nil
+    if s1.empty?
+      @index = i1
+      r1 = nil
     else
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+    end
+    s0 << r1
+    if r1
+      r3 = _nt_space
+      s0 << r3
+    end
+    if s0.last
       r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
       r0.extend(Stat0)
+      r0.extend(Stat1)
+    else
+      @index = i0
+      r0 = nil
     end
 
     node_cache[:stat][start_index] = r0

data/lib/exalted_math/math.treetop

@@ -2,12 +2,12 @@ module Exalted
 grammar Maths
 
   rule additive
-    multitive space* '+' space* additive {
+    multitive  '+' space  additive {
       def ast
         Ast.add(multitive.ast, additive.ast )
       end
    }
-  / multitive space* '-' space* additive {
+  / multitive  '-' space additive {
     def ast
       Ast.sub( multitive.ast, additive.ast )
     end
@@ -16,13 +16,13 @@ grammar Maths
   end
 
   rule multitive
-    primary space* '*' space* multitive {
+    primary '*' space multitive {
        def ast
          Ast.mul(primary.ast, multitive.ast )
        end
     }
     /
-    primary space* '/' space* multitive {
+    primary '/' space multitive {
        def ast
          Ast.div( primary.ast, multitive.ast )
        end
@@ -31,7 +31,7 @@ grammar Maths
   end
 
   rule primary
-    '(' space* additive space* ')' {
+    '(' space additive ')' space {
         def ast
           additive.ast
         end
@@ -40,7 +40,7 @@ grammar Maths
   end
 
   rule spec
-    [Ss] 'pec' 'iality'? ':"' speciality:[^"]+ '"' {
+    [Ss] 'pec' 'iality'? ':"' speciality:[^"]+ '"' space {
       def value
         speciality.text_value
       end
@@ -52,7 +52,7 @@ grammar Maths
   end
 
   rule max
-    ( 'max' / 'highest' ) num:(  '[' number ']' )?  '(' space* list space*  ')' {
+    ( 'max' / 'highest' ) num:(  '[' number ']' )?  '('  list   ')' {
        def count
          if num.elements
            num.elements.detect { |e| e.respond_to?(:value) }.value
@@ -68,7 +68,7 @@ grammar Maths
   end
 
   rule min
-    ( 'min' / 'lowest' ) num:(  '[' number ']' )?  '(' space* list space*  ')' {
+    ( 'min' / 'lowest' ) num:(  '[' number ']' )?  '('  list   ')' {
        def count
          if num.elements
            num.elements.detect { |e| e.respond_to?(:value) }.value
@@ -83,7 +83,7 @@ grammar Maths
   end
 
   rule list
-    ( ( number / stat ) space* ',' space* )* space* ( number / stat ) {
+    space ( number / stat ) (  ',' space  ( number / stat ) )*   {
         def dig(values, elements)
           elements.each do |elem|
             values << elem if elem.respond_to?(:value)
@@ -101,11 +101,11 @@ grammar Maths
   end
 
   rule space
-    ( " " / "\t" )+
+    " "?
   end
 
   rule number
-    negative:('-')? [1-9] [0-9]* {
+    negative:('-')? [1-9] [0-9]* space {
         def value
           text_value.to_i*neg
         end
@@ -120,9 +120,9 @@ grammar Maths
   end
 
   rule stat
-    [A-Za-z]+ {
+    statistic:[A-Za-z]+ space {
         def value
-          text_value.downcase
+          statistic.text_value.downcase
         end
         def ast
           Ast.stat(value)

data/spec/parser_spec.rb

@@ -4,18 +4,25 @@ require 'spec_helper'
 require 'exalted_math'
 
 include Exalted
+
+class ParserFailure < Bacon::Error
+  def initialize(failure)
+    super :failure, failure
+  end
+end
 describe "Exalted::MathParser" do
   before do
     @parser = Exalted::MathsParser.new
   end
 
   [
-    ['4', Ast.num(4)],
-    ['-1', Ast.num(-1)],
-    ['3 * 4', Ast.mul(Ast.num(3), Ast.num(4) )],
-    ['3 - 4', Ast.sub(Ast.num(3), Ast.num(4) )],
-    ['3 + 4', Ast.add(Ast.num(3), Ast.num(4) )],
-    ['6 / 3', Ast.div(Ast.num(6), Ast.num(3) )],
+    [' 4 ', Ast.num(4)],
+    [' -1 ', Ast.num(-1)],
+    [' 3 * 4 ', Ast.mul(Ast.num(3), Ast.num(4) )],
+    [' 3 - 4 ', Ast.sub(Ast.num(3), Ast.num(4) )],
+    [' 3 + 4 ', Ast.add(Ast.num(3), Ast.num(4) )],
+    [' 6 / 3 ', Ast.div(Ast.num(6), Ast.num(3) )],
+    [' spec:"Beating stuff" ', Ast.spec("Beating stuff")],
     ['Essence * 4', Ast.mul(Ast.stat('essence'), Ast.num(4) )],
     ['(Essence * 4) + Willpower', Ast.add(Ast.mul(Ast.stat('essence'), Ast.num(4) ), Ast.stat('willpower'))],
     ['highest[2](compassion,conviction,temperance,valor)', Ast.max(2, [Ast.stat('compassion'),Ast.stat('conviction'),Ast.stat('temperance'),Ast.stat('valor') ])],
@@ -23,9 +30,16 @@ describe "Exalted::MathParser" do
   ].each do |string, ast|
     it "parses '#{string}'" do
       success, result = @parser.ast(string)
+      raise ParserFailure, result unless success
       success.should.be.true
       result.should == ast
     end
   end
+
+  it "Doesn't care about spaces" do
+    success, result = @parser.ast(' ( Essence    * 4 )   +    Willpower + highest[2]( compassion , conviction ) ')
+    raise ParserFailure, result unless success
+    success.should.be.true
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exalted_math
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jonathan Stott
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-06 00:00:00 +01:00
+date: 2010-06-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency