@@ -14,12 +14,13 @@ module Dicelib def self.expr(str) raise ArgumentError, "#{str} is not a string" unless str.is_a?(String) - if str.match(/(\d+)d(\d+)/) + if str.match(/^(\d+)d(\d+)$/) dice = [] - $~[1].to_i.times { dice << Dice.new($~)} + $~[1].to_i.times { dice << Dice.new($~[2]) } else raise ArgumentError, "#{str.inspect} doesn't match the format" end + new(*dice) end def add(*dice) lib/dicelib/roll.rb 77932365ad3d561bbd726e7d3b824f511b9caa05 madx root@yapok.org http://github.com/madx/dicelib/commit/90af0fb9a7fdfa00a893e82d4db6253821a2226c 90af0fb9a7fdfa00a893e82d4db6253821a2226c 2008-06-11T01:51:50-07:00 2008-06-11T01:51:50-07:00 Enhanced Roll::expr 52d40a741d5553cbd6183d35991a76ac6988bfdd madx root@yapok.org