exalted_math 0.1.3 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/exalted_math.gemspec

@@ -1,49 +1,51 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{exalted_math}
-  s.version = "0.1.3"
+  s.name = "exalted_math"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonathan Stott"]
-  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.}
-  s.email = %q{jonathan.stott@gmail.com}
+  s.date = "2012-05-11"
+  s.description = "Parsing and evaluation of simple maths expressions for Exalted\n\nThis intended to aid in evaluating simple calculations which appear on character sheets, especially for Exalted."
+  s.email = "jonathan.stott@gmail.com"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "exalted_math.gemspec",
-     "lib/exalted_math.rb",
-     "lib/exalted_math/ast.rb",
-     "lib/exalted_math/math.rb",
-     "lib/exalted_math/math.treetop",
-     "spec/ast_spec.rb",
-     "spec/parser_spec.rb",
-     "spec/spec_helper.rb"
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "exalted_math.gemspec",
+    "lib/exalted_math.rb",
+    "lib/exalted_math/math.rb",
+    "lib/exalted_math/math.treetop",
+    "lib/exalted_math/node.rb",
+    "lib/exalted_math/node/add.rb",
+    "lib/exalted_math/node/divide.rb",
+    "lib/exalted_math/node/list.rb",
+    "lib/exalted_math/node/maximum.rb",
+    "lib/exalted_math/node/minimum.rb",
+    "lib/exalted_math/node/multiply.rb",
+    "lib/exalted_math/node/named.rb",
+    "lib/exalted_math/node/node.rb",
+    "lib/exalted_math/node/number.rb",
+    "lib/exalted_math/node/operator.rb",
+    "lib/exalted_math/node/subtract.rb",
+    "script/benchmark.rb",
+    "spec/node_spec.rb",
+    "spec/parser_spec.rb",
+    "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/namelessjon/exalted_math}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.homepage = "http://github.com/namelessjon/exalted_math"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Parsing and evaluation of simple maths expressions for Exalted}
-  s.test_files = [
-    "spec/ast_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/parser_spec.rb"
-  ]
+  s.rubygems_version = "1.8.24"
+  s.summary = "Parsing and evaluation of simple maths expressions for Exalted"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/exalted_math.rb

@@ -2,9 +2,12 @@
 # Jonathan D. Stott <jonathan.stott@gmail.com>
 require 'treetop/runtime'
 require 'exalted_math/math'
-require 'exalted_math/ast'
+require 'exalted_math/node'
 
-module Exalted
+module ExaltedMath
+
+  class ContextError < StandardError; end
+  class ParseFailedError < StandardError; end
   class MathsParser
     def ast(text)
       txt = text.dup
@@ -12,9 +15,9 @@ module Exalted
       txt.gsub!(/\s+/," ")
       result = parse(txt)
       if result
-        [true, result.ast]
+        result.ast
       else
-        [false, failure_reason]
+        raise ParseFailedError, failure_reason
       end
     end
   end

data/lib/exalted_math/math.rb

@@ -1,7 +1,7 @@
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
-module Exalted
+module ExaltedMath
 module Maths
   include Treetop::Runtime
 
@@ -25,7 +25,7 @@ module Maths
 
   module Additive1
     def ast
-      Ast.add(multitive.ast, additive.ast )
+      Node::Add.new(multitive.ast, additive.ast )
     end
   end
 
@@ -45,7 +45,7 @@ module Maths
 
   module Additive3
     def ast
-      Ast.sub( multitive.ast, additive.ast )
+      Node::Subtract.new( multitive.ast, additive.ast )
     end
   end
 
@@ -156,7 +156,7 @@ module Maths
 
   module Multitive1
     def ast
-      Ast.mul(primary.ast, multitive.ast )
+      Node::Multiply.new(primary.ast, multitive.ast )
     end
   end
 
@@ -176,7 +176,7 @@ module Maths
 
   module Multitive3
     def ast
-      Ast.div( primary.ast, multitive.ast )
+      Node::Divide.new( primary.ast, multitive.ast )
     end
   end
 
@@ -395,7 +395,7 @@ module Maths
     end
 
     def ast
-      Ast.spec(value)
+      Node::Spec.new(value)
     end
   end
 
@@ -532,7 +532,7 @@ module Maths
     end
 
     def ast
-      Ast.max( count, list.asts )
+      Node::Maximum.new(list.asts, count)
     end
   end
 
@@ -677,7 +677,7 @@ module Maths
       end
     end
     def ast
-      Ast.min( count, list.asts )
+      Node::Minimum.new(list.asts, count)
     end
   end
 
@@ -965,7 +965,7 @@ module Maths
       (negative.elements) ? -1 : 1
     end
     def ast
-      Ast.num(value)
+      Node::Number.new(value)
     end
   end
 
@@ -1054,7 +1054,7 @@ module Maths
       statistic.text_value.downcase
     end
     def ast
-      Ast.stat(value)
+      Node::Stat.new(value)
     end
   end
 

data/lib/exalted_math/math.treetop

@@ -1,15 +1,15 @@
-module Exalted
+module ExaltedMath
 grammar Maths
 
   rule additive
     multitive  '+' space  additive {
       def ast
-        Ast.add(multitive.ast, additive.ast )
+        Node::Add.new(multitive.ast, additive.ast )
       end
    }
   / multitive  '-' space additive {
     def ast
-      Ast.sub( multitive.ast, additive.ast )
+      Node::Subtract.new( multitive.ast, additive.ast )
     end
   }
   / multitive
@@ -18,13 +18,13 @@ grammar Maths
   rule multitive
     primary '*' space multitive {
        def ast
-         Ast.mul(primary.ast, multitive.ast )
+         Node::Multiply.new(primary.ast, multitive.ast )
        end
     }
     /
     primary '/' space multitive {
        def ast
-         Ast.div( primary.ast, multitive.ast )
+         Node::Divide.new( primary.ast, multitive.ast )
        end
     }
     / primary
@@ -46,7 +46,7 @@ grammar Maths
       end
 
       def ast
-        Ast.spec(value)
+        Node::Spec.new(value)
       end
     }
   end
@@ -62,7 +62,7 @@ grammar Maths
        end
 
        def ast
-         Ast.max( count, list.asts )
+         Node::Maximum.new(list.asts, count)
        end
     }
   end
@@ -77,7 +77,7 @@ grammar Maths
          end
        end
        def ast
-         Ast.min( count, list.asts )
+         Node::Minimum.new(list.asts, count)
        end
     }
   end
@@ -114,7 +114,7 @@ grammar Maths
           (negative.elements) ? -1 : 1
         end
         def ast
-          Ast.num(value)
+          Node::Number.new(value)
         end
     }
   end
@@ -125,7 +125,7 @@ grammar Maths
           statistic.text_value.downcase
         end
         def ast
-          Ast.stat(value)
+          Node::Stat.new(value)
         end
     }
   end

data/lib/exalted_math/node.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'exalted_math/node/node'
+require 'exalted_math/node/number'
+require 'exalted_math/node/named'
+require 'exalted_math/node/operator'
+require 'exalted_math/node/add'
+require 'exalted_math/node/subtract'
+require 'exalted_math/node/divide'
+require 'exalted_math/node/multiply'
+require 'exalted_math/node/list'
+require 'exalted_math/node/maximum'
+require 'exalted_math/node/minimum'

data/lib/exalted_math/node/add.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'exalted_math/node/node'
+require 'exalted_math/node/operator'
+module ExaltedMath
+  class Node
+    class Add < Operator
+      def value(context={})
+        left.value(context) + right.value(context)
+      end
+    end
+  end
+end

data/lib/exalted_math/node/divide.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+require 'exalted_math/node/node'
+require 'exalted_math/node/operator'
+module ExaltedMath
+  class Node
+    class Divide < Operator
+      def value(context={})
+        left.value(context) / right.value(context)
+      end
+    end
+  end
+end
+

data/lib/exalted_math/node/list.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+require 'exalted_math/node/node'
+module ExaltedMath
+  class Node
+    class List < Node
+      attr_reader :nodes
+
+      def initialize(nodes=[],*)
+        @nodes = nodes
+      end
+
+      def constant?
+        nodes.all? { |n| n.constant? }
+      end
+
+      def values(context={})
+        nodes.map { |node| node.value(context) }
+      end
+
+      def value(context={})
+        values(context).inject(0) { |total, value| total += value }
+      end
+
+      def simplify
+        if constant?
+          Number.new(value)
+        else
+          self
+        end
+      end
+
+      def ==(o)
+        return false unless self.class === o
+        nodes == o.nodes
+      end
+    end
+  end
+end

data/lib/exalted_math/node/maximum.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'exalted_math/node/node'
+require 'exalted_math/node/list'
+module ExaltedMath
+  class Node
+    class Maximum < List
+      attr_reader :count
+
+      def initialize(nodes=[],count)
+        super
+        @count = count
+      end
+
+      def values(context={})
+        nodes.map { |node| node.value(context) }.sort.slice(-count, count)
+      end
+
+      def ==(o)
+        return false unless super
+        count == o.count
+      end
+    end
+  end
+end
+

data/lib/exalted_math/node/minimum.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+require 'exalted_math/node/node'
+require 'exalted_math/node/list'
+module ExaltedMath
+  class Node
+    class Minimum < List
+      attr_reader :count
+
+      def initialize(nodes=[],count)
+        super
+        @count = count
+      end
+
+      def values(context={})
+        nodes.map { |node| node.value(context) }.sort.slice(0, count)
+      end
+
+      def ==(o)
+        return false unless super
+        count == o.count
+      end
+    end
+  end
+end

data/lib/exalted_math/node/multiply.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+require 'exalted_math/node/node'
+require 'exalted_math/node/operator'
+module ExaltedMath
+  class Node
+    class Multiply < Operator
+      def value(context={})
+        left.value(context) * right.value(context)
+      end
+    end
+  end
+end
+

data/lib/exalted_math/node/named.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+require 'exalted_math/node/node'
+module ExaltedMath
+  class Node
+    class Named < Node
+      attr_reader :name
+      def initialize(name)
+        @name = name
+      end
+
+      def constant?
+        false
+      end
+
+      def value(context={})
+        context.fetch(name) { raise ContextError, name }
+      end
+
+      def ==(o)
+        return false unless self.class === o
+        self.name == o.name
+      end
+
+      def valid?(stats)
+        stats.include?(name)
+      end
+    end
+
+    class Stat < Named
+    end
+
+    class Spec < Named
+    end
+
+  end
+end