bcdice 3.1.3 → 3.5.0

data/lib/bcdice/command/parser.rb

@@ -37,10 +37,16 @@ module BCDice
     class Parser < Racc::Parser
 
 
+# @param notations [Array<String, Regexp>] 反応するコマンドの表記
+# @param round_type [Symbol] 除算での端数の扱い
 def initialize(*notations, round_type:)
   super()
   @notations = notations
   @round_type = round_type
+  @prefix_number = false
+  @suffix_number = false
+  @need_prefix_number = false
+  @need_suffix_number = false
   @modifier = true
   @critical = false
   @fumble = false
@@ -56,6 +62,36 @@ def disable_modifier
   self
 end
 
+# リテラルの前に数値を許可する
+# @return [BCDice::Command::Parser]
+def enable_prefix_number
+  @prefix_number = true
+  self
+end
+
+# リテラルの後ろに数値を許可する
+# @return [BCDice::Command::Parser]
+def enable_suffix_number
+  @suffix_number = true
+  self
+end
+
+# リテラルの前に数値が必要であると設定する
+# @return [BCDice::Command::Parser]
+def has_prefix_number
+  @prefix_number = true
+  @need_prefix_number = true
+  self
+end
+
+# リテラルの後ろに数値が必要であると設定する
+# @return [BCDice::Command::Parser]
+def has_suffix_number
+  @suffix_number = true
+  @need_suffix_number = true
+  self
+end
+
 # +@+によるクリティカル値の指定を許可する
 # @return [BCDice::Command::Parser]
 def enable_critical
@@ -106,7 +142,9 @@ private
 
 def parsed(notation, option, modifier, target)
   Parsed.new.tap do |p|
-    p.command = notation
+    p.command = notation[:command]
+    p.prefix_number = notation[:prefix]&.eval(@round_type)
+    p.suffix_number = notation[:suffix]&.eval(@round_type)
     p.critical = option[:critical]&.eval(@round_type)
     p.fumble = option[:fumble]&.eval(@round_type)
     p.dollar = option[:dollar]&.eval(@round_type)
@@ -128,101 +166,111 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    24,     6,     7,    16,    17,    20,    21,    16,    17,    23,
-     6,     7,    14,    36,    37,    31,    11,    12,    13,    14,
-    24,     2,    24,    36,    37,    20,    21,    20,    21,    23,
-    24,    23,    24,    41,    42,    20,    21,    20,    21,    23,
-    24,    23,    24,    36,    37,    20,    21,    20,    21,    23,
-    24,    23,    24,    36,    37,    20,    21,    20,    21,    23,
-    24,    23,    24,    36,    37,    20,    21,    20,    21,    23,
-    24,    23,    24,    36,    37,    20,    21,    20,    21,    23,
-    24,    23,    24,    36,    37,    20,    21,    20,    21,    23,
-     3,    23,    41,    42,     8,   nil,   nil,    45,    11,    12,
-    13,    14,    51,    49,    50,    52 ]
+     6,     6,     6,     6,     7,    28,    29,    17,    18,     5,
+     5,     5,     5,     6,    26,    12,     4,    45,    17,    18,
+    10,    11,     5,    10,    11,     6,    23,    24,    25,    26,
+    17,    18,     6,    20,     5,    33,    34,    17,    18,     6,
+    35,     5,    28,    29,    17,    18,     6,   nil,     5,    36,
+    37,    17,    18,     6,   nil,     5,    36,    37,    17,    18,
+     6,   nil,     5,    36,    37,    17,    18,     6,   nil,     5,
+    33,    34,    17,    18,     6,   nil,     5,    36,    37,    17,
+    18,     6,   nil,     5,    36,    37,    17,    18,     6,   nil,
+     5,    36,    37,    17,    18,     6,   nil,     5,    36,    37,
+    17,    18,     6,   nil,     5,   nil,   nil,    17,    18,     6,
+   nil,     5,   nil,   nil,    17,    18,   nil,   nil,     5,    23,
+    24,    25,    26,    56,    54,    55,    57 ]
 
 racc_action_check = [
-    14,     2,     2,     9,     9,    14,    14,     5,     5,    14,
-     4,     4,     9,    18,    18,    14,     4,     4,     4,     4,
-     6,     0,     7,    25,    25,     6,     6,     7,     7,     6,
-    11,     7,    12,    30,    30,    11,    11,    12,    12,    11,
-    13,    12,    16,    32,    32,    13,    13,    16,    16,    13,
-    17,    16,    20,    34,    34,    17,    17,    20,    20,    17,
-    21,    20,    23,    35,    35,    21,    21,    23,    23,    21,
-    36,    23,    37,    46,    46,    36,    36,    37,    37,    36,
-    41,    37,    42,    47,    47,    41,    41,    42,    42,    41,
-     1,    42,    40,    40,     3,   nil,   nil,    40,    15,    15,
-    15,    15,    44,    44,    44,    44 ]
+     0,     4,    26,    12,     1,    21,    21,    26,    26,     0,
+     4,    26,    12,     5,    21,     3,     0,    26,     5,     5,
+     8,     8,     5,     2,     2,    10,     8,     8,     8,     8,
+    10,    10,    11,     7,    10,    14,    14,    11,    11,    17,
+    14,    11,     9,     9,    17,    17,    18,   nil,    17,    15,
+    15,    18,    18,    23,   nil,    18,    30,    30,    23,    23,
+    24,   nil,    23,    31,    31,    24,    24,    25,   nil,    24,
+    44,    44,    25,    25,    28,   nil,    25,    47,    47,    28,
+    28,    29,   nil,    28,    48,    48,    29,    29,    33,   nil,
+    29,    49,    49,    33,    33,    34,   nil,    33,    50,    50,
+    34,    34,    36,   nil,    34,   nil,   nil,    36,    36,    37,
+   nil,    36,   nil,   nil,    37,    37,   nil,   nil,    37,    27,
+    27,    27,    27,    52,    52,    52,    52 ]
 
 racc_action_pointer = [
-     3,    90,    -6,    94,     3,     0,    18,    20,   nil,    -4,
-   nil,    28,    30,    38,    -2,    85,    40,    48,     4,   nil,
-    50,    58,   nil,    60,   nil,    14,   nil,   nil,   nil,   nil,
-    26,   nil,    34,   nil,    44,    54,    68,    70,   nil,   nil,
-    85,    78,    80,   nil,    99,   nil,    64,    74,   nil,   nil,
-   nil,   nil,   nil ]
+    -2,     4,    16,    -3,    -1,    11,   nil,    33,    13,    35,
+    23,    30,     1,   nil,    28,    40,   nil,    37,    44,   nil,
+   nil,    -2,   nil,    51,    58,    65,     0,   106,    72,    79,
+    47,    54,   nil,    86,    93,   nil,   100,   107,   nil,   nil,
+   nil,   nil,   nil,   nil,    63,   nil,   nil,    68,    75,    82,
+    89,   nil,   120,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -31,   -31,    -4,   -31,   -12,    -4,   -31,   -31,    53,   -12,
-    -3,   -31,   -31,   -31,   -31,   -12,   -31,   -31,    -8,   -20,
-   -31,   -31,   -28,   -31,   -30,    -9,    -1,    -5,    -6,    -7,
-   -13,   -14,   -17,    -2,   -10,   -11,   -31,   -31,   -26,   -27,
-   -31,   -31,   -31,   -18,   -21,   -29,   -15,   -16,   -19,   -22,
-   -23,   -24,   -25 ]
+   -35,   -35,    -8,   -35,    -7,   -35,   -34,   -35,   -16,    -8,
+   -35,   -35,    -5,    -6,   -35,   -21,   -24,   -35,   -35,   -32,
+    58,   -16,    -3,   -35,   -35,   -35,   -35,   -16,   -35,   -35,
+   -12,   -13,    -4,   -35,   -35,   -33,   -35,   -35,   -30,   -31,
+    -1,    -9,   -10,   -11,   -17,   -18,    -2,   -14,   -15,   -19,
+   -20,   -22,   -25,   -23,   -26,   -27,   -28,   -29 ]
 
 racc_goto_table = [
-    18,    25,     1,    27,    28,    29,    30,    48,   nil,    10,
-    34,    35,    38,    39,    26,    40,     4,   nil,   nil,    15,
-    33,     5,   nil,     9,   nil,   nil,   nil,   nil,    43,    44,
-   nil,   nil,   nil,   nil,   nil,    46,    47 ]
+    30,    31,    38,    39,    14,     8,     1,    22,    41,    42,
+    43,     9,    27,     2,    53,   nil,   nil,    21,    47,    48,
+    40,    51,    52,    49,    50,    44,    46,     3,   nil,   nil,
+   nil,    13,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    32 ]
 
 racc_goto_check = [
-     6,     6,     1,     5,     5,     5,     7,     8,   nil,     4,
-     6,     6,     5,     5,     4,     7,     2,   nil,   nil,     2,
-     4,     3,   nil,     3,   nil,   nil,   nil,   nil,     5,     5,
-   nil,   nil,   nil,   nil,   nil,     6,     6 ]
+     8,     8,     7,     7,     9,     3,     1,     5,     7,     7,
+     7,     4,     3,     2,    10,   nil,   nil,     4,     8,     8,
+     5,     7,     7,     8,     8,     9,     5,     6,   nil,   nil,
+   nil,     6,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     6 ]
 
 racc_goto_pointer = [
-   nil,     2,    14,    19,     5,    -8,    -6,    -8,   -37,   nil ]
+   nil,     6,    13,     3,     9,    -1,    27,   -15,   -10,    -1,
+   -38 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,    19,    32,   nil,   nil,    22 ]
+   nil,   nil,   nil,   nil,   nil,   nil,    19,    16,    15,   nil,
+   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
   4, 20, :_reduce_1,
   4, 20, :_reduce_2,
   3, 20, :_reduce_3,
-  0, 21, :_reduce_4,
-  3, 21, :_reduce_5,
-  3, 21, :_reduce_6,
-  3, 21, :_reduce_7,
-  2, 22, :_reduce_8,
-  2, 22, :_reduce_9,
+  3, 21, :_reduce_4,
+  2, 21, :_reduce_5,
+  2, 21, :_reduce_6,
+  1, 21, :_reduce_7,
+  0, 22, :_reduce_8,
+  3, 22, :_reduce_9,
   3, 22, :_reduce_10,
   3, 22, :_reduce_11,
-  0, 23, :_reduce_12,
+  2, 23, :_reduce_12,
   2, 23, :_reduce_13,
-  2, 23, :_reduce_14,
-  3, 26, :_reduce_15,
-  3, 26, :_reduce_16,
+  3, 23, :_reduce_14,
+  3, 23, :_reduce_15,
+  0, 24, :_reduce_16,
+  2, 24, :_reduce_17,
+  2, 24, :_reduce_18,
+  3, 28, :_reduce_19,
+  3, 28, :_reduce_20,
+  1, 28, :_reduce_none,
+  3, 27, :_reduce_22,
+  4, 27, :_reduce_23,
+  1, 27, :_reduce_none,
+  0, 29, :_reduce_25,
+  1, 29, :_reduce_26,
+  1, 29, :_reduce_27,
+  1, 29, :_reduce_28,
+  1, 29, :_reduce_29,
+  2, 26, :_reduce_30,
+  2, 26, :_reduce_31,
   1, 26, :_reduce_none,
-  3, 25, :_reduce_18,
-  4, 25, :_reduce_19,
-  1, 25, :_reduce_none,
-  0, 27, :_reduce_21,
-  1, 27, :_reduce_22,
-  1, 27, :_reduce_23,
-  1, 27, :_reduce_24,
-  1, 27, :_reduce_25,
-  2, 24, :_reduce_26,
-  2, 24, :_reduce_27,
-  1, 24, :_reduce_none,
-  3, 28, :_reduce_29,
-  1, 28, :_reduce_30 ]
-
-racc_reduce_n = 31
-
-racc_shift_n = 53
+  3, 25, :_reduce_33,
+  1, 25, :_reduce_34 ]
+
+racc_reduce_n = 35
+
+racc_shift_n = 58
 
 racc_token_table = {
   false => 0,
@@ -287,14 +335,15 @@ Racc_token_to_s_table = [
   "NOTATION",
   "$start",
   "expr",
+  "notation",
   "option",
   "modifier",
   "target",
+  "term",
   "unary",
   "mul",
   "add",
-  "round_type",
-  "term" ]
+  "round_type" ]
 
 Racc_debug_parser = false
 
@@ -326,12 +375,42 @@ def _reduce_3(val, _values, result)
 end
 
 def _reduce_4(val, _values, result)
-            result = {}
+              raise ParseError unless @prefix_number && @suffix_number
+              result = { command: val[1], prefix: val[0], suffix: val[2] }
 
     result
 end
 
 def _reduce_5(val, _values, result)
+              raise ParseError unless @prefix_number
+              raise ParseError if @need_suffix_number
+              result = { command: val[1], prefix: val[0] }
+
+    result
+end
+
+def _reduce_6(val, _values, result)
+              raise ParseError unless @suffix_number
+              raise ParseError if @need_prefix_number
+              result = { command: val[0], suffix: val[1] }
+
+    result
+end
+
+def _reduce_7(val, _values, result)
+              raise ParseError if @need_prefix_number || @need_suffix_number
+              result = { command: val[0] }
+
+    result
+end
+
+def _reduce_8(val, _values, result)
+            result = {}
+
+    result
+end
+
+def _reduce_9(val, _values, result)
             option, _, term = val
             raise ParseError unless @critical && option[:critical].nil?
 
@@ -341,7 +420,7 @@ def _reduce_5(val, _values, result)
     result
 end
 
-def _reduce_6(val, _values, result)
+def _reduce_10(val, _values, result)
             option, _, term = val
             raise ParseError unless @fumble && option[:fumble].nil?
 
@@ -351,7 +430,7 @@ def _reduce_6(val, _values, result)
     result
 end
 
-def _reduce_7(val, _values, result)
+def _reduce_11(val, _values, result)
             option, _, term = val
             raise ParseError unless @dollar && option[:dollar].nil?
 
@@ -361,34 +440,34 @@ def _reduce_7(val, _values, result)
     result
 end
 
-def _reduce_8(val, _values, result)
+def _reduce_12(val, _values, result)
  result = val[1]
     result
 end
 
-def _reduce_9(val, _values, result)
+def _reduce_13(val, _values, result)
  result = Arithmetic::Node::Negative.new(val[1])
     result
 end
 
-def _reduce_10(val, _values, result)
+def _reduce_14(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :+, val[2])
     result
 end
 
-def _reduce_11(val, _values, result)
+def _reduce_15(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :-, val[2])
     result
 end
 
-def _reduce_12(val, _values, result)
+def _reduce_16(val, _values, result)
             raise ParseError unless @allowed_cmp_op.include?(nil)
             result = {}
 
     result
 end
 
-def _reduce_13(val, _values, result)
+def _reduce_17(val, _values, result)
             cmp_op, target = val
             raise ParseError unless @allowed_cmp_op.include?(cmp_op)
 
@@ -397,7 +476,7 @@ def _reduce_13(val, _values, result)
     result
 end
 
-def _reduce_14(val, _values, result)
+def _reduce_18(val, _values, result)
             cmp_op = val[0]
             raise ParseError unless @question_target
             raise ParseError unless @allowed_cmp_op.include?(cmp_op)
@@ -407,75 +486,75 @@ def _reduce_14(val, _values, result)
     result
 end
 
-def _reduce_15(val, _values, result)
+def _reduce_19(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :+, val[2])
     result
 end
 
-def _reduce_16(val, _values, result)
+def _reduce_20(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :-, val[2])
     result
 end
 
-# reduce 17 omitted
+# reduce 21 omitted
 
-def _reduce_18(val, _values, result)
+def _reduce_22(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :*, val[2])
     result
 end
 
-def _reduce_19(val, _values, result)
+def _reduce_23(val, _values, result)
          divied_class = val[3]
          result = divied_class.new(val[0], val[2])
 
     result
 end
 
-# reduce 20 omitted
+# reduce 24 omitted
 
-def _reduce_21(val, _values, result)
+def _reduce_25(val, _values, result)
  result = Arithmetic::Node::DivideWithGameSystemDefault
     result
 end
 
-def _reduce_22(val, _values, result)
+def _reduce_26(val, _values, result)
  result = Arithmetic::Node::DivideWithCeil
     result
 end
 
-def _reduce_23(val, _values, result)
+def _reduce_27(val, _values, result)
  result = Arithmetic::Node::DivideWithCeil
     result
 end
 
-def _reduce_24(val, _values, result)
+def _reduce_28(val, _values, result)
  result = Arithmetic::Node::DivideWithRound
     result
 end
 
-def _reduce_25(val, _values, result)
+def _reduce_29(val, _values, result)
  result = Arithmetic::Node::DivideWithFloor
     result
 end
 
-def _reduce_26(val, _values, result)
+def _reduce_30(val, _values, result)
  result = val[1]
     result
 end
 
-def _reduce_27(val, _values, result)
+def _reduce_31(val, _values, result)
  result = Arithmetic::Node::Negative.new(val[1])
     result
 end
 
-# reduce 28 omitted
+# reduce 32 omitted
 
-def _reduce_29(val, _values, result)
+def _reduce_33(val, _values, result)
  result = val[1]
     result
 end
 
-def _reduce_30(val, _values, result)
+def _reduce_34(val, _values, result)
  result = Arithmetic::Node::Number.new(val[0])
     result
 end

data/lib/bcdice/common_command/add_dice.rb

@@ -7,7 +7,7 @@ require "bcdice/common_command/add_dice/randomizer"
 module BCDice
   module CommonCommand
     module AddDice
-      PREFIX_PATTERN = /[+\-\dD(]+/.freeze
+      PREFIX_PATTERN = /[+\-(]*\d+/.freeze
 
       class << self
         def eval(command, game_system, randomizer)

data/lib/bcdice/common_command/barabara_dice/node.rb

@@ -43,8 +43,8 @@ module BCDice
             Result.new.tap do |r|
               r.secret = @secret
               r.text = sequence.join(" ＞ ")
-              r.rands = randomizer.rand_results
-              r.detailed_rands = randomizer.detailed_rand_results
+              r.last_dice_list_list = dice_list_list
+              r.last_dice_list = dice_list
               r.success_num = success_num
             end
           end

data/lib/bcdice/common_command/barabara_dice/result.rb

@@ -7,6 +7,10 @@ module BCDice
     module BarabaraDice
       # バラバラロールの結果を表すクラス
       class Result < ::BCDice::Result
+        # @return [Array<Array<Integer>>] 出目のグループの配列
+        attr_accessor :last_dice_list_list
+        # @return [Array<Integer>] すべての出目が格納される配列
+        attr_accessor :last_dice_list
         # @return [Integer] 成功数
         attr_accessor :success_num
 
@@ -14,6 +18,8 @@ module BCDice
         def initialize(text = nil)
           super(text)
 
+          @last_dice_list_list = []
+          @last_dice_list = []
           @success_num = 0
         end
       end

data/lib/bcdice/common_command/calc.rb

@@ -5,7 +5,7 @@ require "bcdice/common_command/calc/parser"
 module BCDice
   module CommonCommand
     module Calc
-      PREFIX_PATTERN = /C/.freeze
+      PREFIX_PATTERN = /C[+\-(]*\d+/.freeze
 
       class << self
         def eval(command, game_system, _randomizer)

data/lib/bcdice/common_command/choice.rb

@@ -29,6 +29,17 @@ module BCDice
     #   choice A,B X,Y -> "A,B" と "X,Y" から選ぶ
     #   choice(A[], B[], C[]) -> "A[]", "B[]", "C[]" から選ぶ
     #   choice[A(), B(), C()] -> "A()", "B()", "C()" から選ぶ
+    #
+    # "choice"の後に数を指定することで、列挙した要素から重複なしで複数個を選ぶ
+    #   choice2[A,B,C] -> "A", "B", "C" から重複なしで2個選ぶ
+    #
+    # 指定したい要素が「AからD」のように連続する項目の場合に「A-D」と省略して記述できる
+    # 略記の展開はアルファベット1文字もしくは数字の範囲に限り、略記1つを指定したときのみ展開される
+    #   choice[A-D] -> choice[A,B,C,D] と等価
+    #   choice[b-g] -> choice[b,c,d,e,f,g] と等価
+    #   choice[3-7] -> choice[3,4,5,6,7] と等価
+    #   choice[A-D,Z] -> 展開されない。 "A-D", "Z" から選ぶ
+    #   choice[D-A] -> 展開されない。
     class Choice
       PREFIX_PATTERN = /choice/.freeze
 
@@ -44,6 +55,12 @@ module BCDice
         space: /\s+/,
       }.freeze
 
+      DELIMITER_CHAR = {
+        bracket: ", ",
+        paren: ", ",
+        space: " ",
+      }.freeze
+
       TERMINATION = {
         bracket: /\]/,
         paren: /\)/,
@@ -77,6 +94,11 @@ module BCDice
             return nil
           end
 
+          takes = scanner.scan(/\d+/)&.to_i || 1
+          if takes == 0
+            return nil
+          end
+
           type =
             case scanner.scan(/\(|\[|\s+/)
             when "["
@@ -105,47 +127,100 @@ module BCDice
           items.push(last_item.delete_suffix(SUFFIX[type]))
 
           items = items.map(&:strip).reject(&:empty?)
-          if items.empty?
+          if items.size == 1
+            items = parse_multi_item_shorthand(items.first)
+          end
+
+          if items.empty? || items.size < takes
             return nil
           end
 
           new(
             secret: secret,
             block_delimiter: type,
+            takes: takes,
             items: items
           )
         end
+
+        def parse_multi_item_shorthand(str)
+          parse_multi_nums_shorthand(str) || parse_multi_chars_shorthand(str) || []
+        end
+
+        def parse_multi_nums_shorthand(str)
+          m = /^(\d+)-(\d+)$/.match(str)
+          unless m
+            return nil
+          end
+
+          first = m[1].to_i
+          last = m[2].to_i
+          if first > last
+            return nil
+          end
+
+          return first.upto(last).to_a
+        end
+
+        def parse_multi_chars_shorthand(str)
+          m = /^([a-z])-([a-z])$/.match(str) || /^([A-Z])-([A-Z])$/.match(str)
+          unless m
+            return nil
+          end
+
+          first = m[1]
+          last = m[2]
+          if first > last
+            return nil
+          end
+
+          return first.upto(last).to_a
+        end
       end
 
       # @param secret [Boolean]
       # @param block_delimiter [BlockDelimiter::BRACKET, BlockDelimiter::PAREN, BlockDelimiter::SPACE]
+      # @param takes [Integer] 何個チョイスするか
       # @param items [Array<String>]
-      def initialize(secret:, block_delimiter:, items:)
+      def initialize(secret:, block_delimiter:, takes:, items:)
         @secret = secret
         @block_delimiter = block_delimiter
+        @takes = takes
         @items = items
       end
 
       # @param randomizer [Randomizer]
       # @return [Result]
       def roll(randomizer)
-        index = randomizer.roll_index(@items.size)
-        chosen = @items[index]
+        if @items.size > 100
+          return Result.new("項目数は100以下としてください")
+        end
+
+        items = @items.dup
+        chosens = []
+        @takes.times do
+          index = randomizer.roll_index(items.size)
+          chosens << items.delete_at(index)
+        end
 
         Result.new.tap do |r|
+          chosen = chosens.join(DELIMITER_CHAR[@block_delimiter])
+
           r.secret = @secret
           r.text = "(#{expr()}) ＞ #{chosen}"
         end
       end
 
       def expr
+        takes = @takes == 1 ? nil : @takes
+
         case @block_delimiter
         when BlockDelimiter::SPACE
-          "choice #{@items.join(' ')}"
+          "choice#{takes} #{@items.join(' ')}"
         when BlockDelimiter::BRACKET
-          "choice[#{@items.join(',')}]"
+          "choice#{takes}[#{@items.join(',')}]"
         when BlockDelimiter::PAREN
-          "choice(#{@items.join(',')})"
+          "choice#{takes}(#{@items.join(',')})"
         end
       end
     end