crapshoot 0.3.0 → 0.4.0

data/.gitignore

@@ -2,4 +2,5 @@ Gemfile.lock
 pkg
 .yardoc
 rdoc
-doc
+doc
+coverage

data/README.rdoc

@@ -12,9 +12,13 @@ You might otherwise want to roll three twenty-sided dice and drop the highest, a
 
     Crapshoot.roll '3d20^+6'
 
-Or you might just want nine:
+Or you might just want nine divided by three:
 
-    Crapshoot.roll '9'
+    Crapshoot.roll '9 / 3'
+
+Crapshoot supports addition, subtraction, multiplication, and division with correct order of operations:
+
+    Crapshoot.roll '1 + 2 * 3' # returns seven
 
 == Rolling Dice
 

data/lib/crapshoot/parser/scan.rb

@@ -27,10 +27,10 @@ class << self
 	private :_scanner_trans_keys, :_scanner_trans_keys=
 end
 self._scanner_trans_keys = [
-	0, 0, 48, 57, 9, 45, 
+	0, 0, 48, 57, 9, 47, 
 	9, 57, 9, 57, 48, 
 	57, 9, 100, 9, 118, 
-	9, 45, 0
+	9, 47, 0
 ]
 
 class << self
@@ -38,8 +38,8 @@ class << self
 	private :_scanner_key_spans, :_scanner_key_spans=
 end
 self._scanner_key_spans = [
-	0, 10, 37, 49, 49, 10, 92, 110, 
-	37
+	0, 10, 39, 49, 49, 10, 92, 110, 
+	39
 ]
 
 class << self
@@ -47,8 +47,8 @@ class << self
 	private :_scanner_index_offsets, :_scanner_index_offsets=
 end
 self._scanner_index_offsets = [
-	0, 0, 11, 49, 99, 149, 160, 253, 
-	364
+	0, 0, 11, 51, 101, 151, 162, 255, 
+	366
 ]
 
 class << self
@@ -61,52 +61,52 @@ self._scanner_indicies = [
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 2, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 3, 1, 3, 
-	1, 4, 4, 4, 4, 4, 1, 1, 
+	1, 1, 1, 1, 3, 3, 1, 3, 
+	1, 3, 1, 4, 4, 4, 4, 4, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	4, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 4, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	5, 5, 5, 5, 5, 5, 5, 5, 
-	5, 5, 1, 6, 6, 6, 6, 6, 
+	1, 1, 5, 5, 5, 5, 5, 5, 
+	5, 5, 5, 5, 1, 6, 6, 6, 
+	6, 6, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 6, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 6, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 0, 0, 0, 0, 
+	0, 0, 0, 0, 0, 0, 1, 7, 
+	7, 7, 7, 7, 7, 7, 7, 7, 
+	7, 1, 8, 8, 8, 8, 8, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 1, 7, 7, 7, 
-	7, 7, 7, 7, 7, 7, 7, 1, 
-	8, 8, 8, 8, 8, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 8, 
+	1, 8, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 9, 9, 1, 9, 1, 
+	9, 10, 10, 10, 10, 10, 10, 10, 
+	10, 10, 10, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 9, 1, 9, 1, 1, 10, 
-	10, 10, 10, 10, 10, 10, 10, 10, 
-	10, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 11, 1, 12, 
+	12, 12, 12, 12, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 11, 1, 12, 12, 12, 
-	12, 12, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 1, 1, 12, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 1, 12, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 1, 13, 
-	1, 13, 1, 1, 14, 14, 14, 14, 
-	14, 14, 14, 14, 14, 14, 1, 1, 
+	13, 13, 1, 13, 1, 13, 14, 14, 
+	14, 14, 14, 14, 14, 14, 14, 14, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 15, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 15, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 15, 1, 16, 16, 16, 16, 
-	16, 1, 1, 1, 1, 1, 1, 1, 
+	1, 1, 1, 1, 15, 1, 16, 16, 
+	16, 16, 16, 1, 1, 1, 1, 1, 
 	1, 1, 1, 1, 1, 1, 1, 1, 
-	1, 1, 1, 16, 1, 1, 1, 1, 
-	1, 1, 1, 1, 1, 1, 17, 1, 
-	17, 1, 0
+	1, 1, 1, 1, 1, 16, 1, 1, 
+	1, 1, 1, 1, 1, 1, 1, 17, 
+	17, 1, 17, 1, 17, 1, 0
 ]
 
 class << self
@@ -208,25 +208,31 @@ begin
 # line 4 "lib/crapshoot/parser/scan.rl"
 		begin
  @mark_num = p 		end
+# line 4 "lib/crapshoot/parser/scan.rl"
 	when 5 then
 # line 5 "lib/crapshoot/parser/scan.rl"
 		begin
  @num_stack.push atos(data[@mark_num..p-1]) 		end
+# line 5 "lib/crapshoot/parser/scan.rl"
 	when 2 then
 # line 15 "lib/crapshoot/parser/scan.rl"
 		begin
  @tokens << Tokens::Arithmetic.new(data[p-1].chr) 		end
+# line 15 "lib/crapshoot/parser/scan.rl"
 	when 4 then
 # line 5 "lib/crapshoot/parser/scan.rl"
 		begin
  @num_stack.push atos(data[@mark_num..p-1]) 		end
+# line 5 "lib/crapshoot/parser/scan.rl"
 # line 7 "lib/crapshoot/parser/scan.rl"
 		begin
  @tokens << Tokens::Constant.new(@num_stack.pop) 		end
+# line 7 "lib/crapshoot/parser/scan.rl"
 	when 6 then
 # line 5 "lib/crapshoot/parser/scan.rl"
 		begin
  @num_stack.push atos(data[@mark_num..p-1]) 		end
+# line 5 "lib/crapshoot/parser/scan.rl"
 # line 8 "lib/crapshoot/parser/scan.rl"
 		begin
 
@@ -236,17 +242,21 @@ begin
     count = @num_stack.pop
     @tokens << Tokens::Series.new(count, sides, drop)
   		end
+# line 8 "lib/crapshoot/parser/scan.rl"
 	when 3 then
 # line 15 "lib/crapshoot/parser/scan.rl"
 		begin
  @tokens << Tokens::Arithmetic.new(data[p-1].chr) 		end
+# line 15 "lib/crapshoot/parser/scan.rl"
 # line 4 "lib/crapshoot/parser/scan.rl"
 		begin
  @mark_num = p 		end
+# line 4 "lib/crapshoot/parser/scan.rl"
 	when 7 then
 # line 17 "lib/crapshoot/parser/scan.rl"
 		begin
  @drop_current = data[p-1].chr 		end
+# line 17 "lib/crapshoot/parser/scan.rl"
 # line 8 "lib/crapshoot/parser/scan.rl"
 		begin
 
@@ -256,7 +266,8 @@ begin
     count = @num_stack.pop
     @tokens << Tokens::Series.new(count, sides, drop)
   		end
-# line 260 "lib/crapshoot/parser/scan.rb"
+# line 8 "lib/crapshoot/parser/scan.rl"
+# line 271 "lib/crapshoot/parser/scan.rb"
 	end
 	end
 	end
@@ -278,13 +289,16 @@ begin
 # line 5 "lib/crapshoot/parser/scan.rl"
 		begin
  @num_stack.push atos(data[@mark_num..p-1]) 		end
+# line 5 "lib/crapshoot/parser/scan.rl"
 # line 7 "lib/crapshoot/parser/scan.rl"
 		begin
  @tokens << Tokens::Constant.new(@num_stack.pop) 		end
+# line 7 "lib/crapshoot/parser/scan.rl"
 	when 6 then
 # line 5 "lib/crapshoot/parser/scan.rl"
 		begin
  @num_stack.push atos(data[@mark_num..p-1]) 		end
+# line 5 "lib/crapshoot/parser/scan.rl"
 # line 8 "lib/crapshoot/parser/scan.rl"
 		begin
 
@@ -294,10 +308,12 @@ begin
     count = @num_stack.pop
     @tokens << Tokens::Series.new(count, sides, drop)
   		end
+# line 8 "lib/crapshoot/parser/scan.rl"
 	when 7 then
 # line 17 "lib/crapshoot/parser/scan.rl"
 		begin
  @drop_current = data[p-1].chr 		end
+# line 17 "lib/crapshoot/parser/scan.rl"
 # line 8 "lib/crapshoot/parser/scan.rl"
 		begin
 
@@ -307,7 +323,8 @@ begin
     count = @num_stack.pop
     @tokens << Tokens::Series.new(count, sides, drop)
   		end
-# line 311 "lib/crapshoot/parser/scan.rb"
+# line 8 "lib/crapshoot/parser/scan.rl"
+# line 328 "lib/crapshoot/parser/scan.rb"
 	  end
 	end
 

data/lib/crapshoot/parser/scan.rl

@@ -23,7 +23,7 @@
   Drop = ('^' | 'v') %drop;
   Series = Number 'd' Number Drop? %series;
 
-  Arithmetic = ('+' | '-') %arithmetic;
+  Arithmetic = ('+' | '-' | '*' | '/') %arithmetic;
 
   UnaryExpression = Series | Constant;
   BinaryExpression = UnaryExpression (space* Arithmetic space* UnaryExpression)+;

data/lib/crapshoot/postfixer.rb

@@ -1,24 +1,48 @@
 module Crapshoot
   # Translate the infix-notation tokens into postfix notation to make evaluating them easier.
   class Postfixer
+
+    # Postfixify turns the infix list of tokens from Scanner into a postfix list
+    # by repeatedly calling "step"
     def postfixify(infix_tokens)
       @infix_orig = infix_tokens
       @infix = @infix_orig.dup
       @postfix = []
+      @operator_stack = []
       until @infix.empty?
         step
       end
 
+      until @operator_stack.empty?
+        @postfix.push @operator_stack.pop
+      end
+
       return @postfix
     end
 
+    # step shifts an independent (Constant or Series) token to the
+    # postfix list, or loads a dependent (Arithmetic) token into the
+    # operator_stack for future postfixing.
     def step
       candidate = @infix.shift
-      unless candidate.independent
-        dependency = @infix.shift
-        @postfix.push dependency
-      end
+      process_independent candidate
+      process_operator candidate
+    end
+
+    def process_independent(candidate)
+      return unless candidate.independent
       @postfix.push candidate
     end
+
+    def process_operator(candidate)
+      return if candidate.independent
+
+      if @operator_stack.empty? || candidate.precedent(@operator_stack.last)
+        @operator_stack.push candidate
+      else
+        @postfix.push @operator_stack.pop
+        @operator_stack.push candidate
+      end
+    end
   end
 end

data/lib/crapshoot/tokens/arithmetic.rb

@@ -9,6 +9,15 @@ module Crapshoot
         false
       end
 
+      def precedent(stack_top)
+        return true if high_priority? && !stack_top.high_priority?
+        return false
+      end
+
+      def high_priority?
+        @operation == '*' || @operation == '/'
+      end
+
       def eval(stack)
         r = stack.pop
         l = stack.pop

data/lib/crapshoot/tokens/base.rb

@@ -4,6 +4,9 @@ module Crapshoot
       def independent
         true
       end
+      def precedent(stack_top)
+        true
+      end
     end
   end
 end

data/lib/crapshoot/version.rb

@@ -1,3 +1,3 @@
 module Crapshoot
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/test/crapshoot_test.rb

@@ -27,6 +27,13 @@ class TestCrapshoot < Test::Unit::TestCase
     should_roll '10-5', '=='=>5
     should_roll '5-10', '=='=>-5
 
+    should_roll '2*5', '=='=>10
+    should_roll '10/2', '=='=>5
+    should_roll '1 + 2 * 3', '=='=>7
+    should_roll '4 * 5 + 6', '=='=>26
+    should_roll '4 * 5 / 10', '=='=>2
+    should_roll '2 * 3 + 4 * 5 + 10 + 10 * 8 / 2', '=='=>76
+
     should_describe '1 + 2', '1+2'
     should_describe '10 - 5', '10-5'
     should_describe '2d6', /\(\d\+\d\)/

data/test/postfixer_test.rb

@@ -14,9 +14,11 @@ class TestPostfixer < Test::Unit::TestCase
     end
 
     five = Constant.new '5'
+    six = Constant.new '6'
+    seven = Constant.new '7'
     plus = Arithmetic.new '+'
     minus = Arithmetic.new '-'
-    six = Constant.new '6'
+    times = Arithmetic.new '*'
     series1 = Series.new '5', '6', nil
     series2 = Series.new '4', '20', 'v'
 
@@ -24,5 +26,7 @@ class TestPostfixer < Test::Unit::TestCase
                       [five, six, plus])
     should_postfixify([series1, plus, six, minus, series2],
                       [series1, six, plus, series2, minus])
+    should_postfixify([five, plus, six, times, seven],
+                      [five, six, seven, times, plus])
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Bryce Kerley
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -05:00
+date: 2011-01-12 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency