bcdice 3.0.0.pre.alpha.2 → 3.1.1

data/lib/bcdice/common_command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bcdice/common_command/add_dice"
 require "bcdice/common_command/barabara_dice"
 require "bcdice/common_command/calc"

data/lib/bcdice/common_command/add_dice.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bcdice/normalize"
 require "bcdice/common_command/add_dice/parser"
 require "bcdice/common_command/add_dice/randomizer"
@@ -5,7 +7,7 @@ require "bcdice/common_command/add_dice/randomizer"
 module BCDice
   module CommonCommand
     module AddDice
-      PREFIX_PATTERN = /[\+\-\dD\(\[]+/.freeze
+      PREFIX_PATTERN = /[+\-\dD(\[]+/.freeze
 
       class << self
         def eval(command, game_system, randomizer)

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

@@ -34,9 +34,10 @@ module BCDice
           end
 
           # 文字列に変換する
+          # @param game_system [BCDice::Base]
           # @return [String]
-          def to_s
-            @lhs.to_s + cmp_op_text + @rhs&.eval(nil).to_s
+          def expr(game_system)
+            @lhs.expr(game_system) + cmp_op_text + @rhs&.eval(game_system, nil).to_s
           end
 
           # ノードのS式を返す
@@ -51,7 +52,7 @@ module BCDice
 
           def eval(game_system, randomizer)
             randomizer = Randomizer.new(randomizer, game_system)
-            total = @lhs.eval(randomizer)
+            total = @lhs.eval(game_system, randomizer)
 
             interrim_expr =
               unless randomizer.rand_results.size <= 1 && @lhs.is_a?(Node::DiceRoll)
@@ -60,13 +61,13 @@ module BCDice
 
             result =
               if @cmp_op
-                rhs = @rhs.eval(nil)
+                rhs = @rhs.eval(game_system, nil)
                 game_system.check_result(total, randomizer.rand_results, @cmp_op, rhs)
               end
             result ||= Result.new
 
             sequence = [
-              "(#{self})",
+              "(#{expr(game_system)})",
               interrim_expr,
               total,
               result&.text
@@ -97,7 +98,7 @@ module BCDice
         class UndecidedTarget
           include Singleton
 
-          def eval(_randomizer)
+          def eval(_game_system, _randomizer)
             "?"
           end
 
@@ -105,12 +106,15 @@ module BCDice
             false
           end
 
-          def to_s
+          def expr(_game_system)
             "?"
           end
 
-          alias output to_s
-          alias s_exp to_s
+          def output
+            "?"
+          end
+
+          alias s_exp output
         end
 
         # 二項演算子のノード
@@ -129,13 +133,14 @@ module BCDice
           #
           # 左右のオペランドをそれぞれ再帰的に評価した後で、演算を行う。
           #
-          # @param [Randomizer] randomizer ランダマイザ
+          # @param game_system [BCDice::Base]
+          # @param randomizer [Randomizer] ランダマイザ
           # @return [Integer] 評価結果
-          def eval(randomizer)
-            lhs = @lhs.eval(randomizer)
-            rhs = @rhs.eval(randomizer)
+          def eval(game_system, randomizer)
+            lhs = @lhs.eval(game_system, randomizer)
+            rhs = @rhs.eval(game_system, randomizer)
 
-            return calc(lhs, rhs)
+            return calc(lhs, rhs, game_system.round_type)
           end
 
           # @return [Boolean]
@@ -145,8 +150,11 @@ module BCDice
 
           # 文字列に変換する
           # @return [String]
-          def to_s
-            "#{@lhs}#{@op}#{@rhs}"
+          def expr(game_system)
+            lhs = @lhs.expr(game_system)
+            rhs = @rhs.expr(game_system)
+
+            "#{lhs}#{@op}#{rhs}"
           end
 
           # メッセージへの出力を返す
@@ -164,10 +172,11 @@ module BCDice
           private
 
           # 演算を行う
-          # @param [Integer] lhs 左のオペランド
-          # @param [Integer] rhs 右のオペランド
+          # @param lhs [Integer] lhs 左のオペランド
+          # @param rhs [Integer] 右のオペランド
+          # @param _round_type [Symbol] ゲームシステムの端数処理設定
           # @return [Integer] 演算の結果
-          def calc(lhs, rhs)
+          def calc(lhs, rhs, _round_type)
             lhs.send(@op, rhs)
           end
 
@@ -196,8 +205,8 @@ module BCDice
           # 通常の結果の末尾に、端数処理方法を示す記号を付加する。
           #
           # @return [String]
-          def to_s
-            "#{super}#{rounding_method}"
+          def expr(game_system)
+            "#{super(game_system)}#{rounding_method}"
           end
 
           # メッセージへの出力を返す
@@ -224,26 +233,51 @@ module BCDice
           end
 
           # 演算を行う
-          # @param [Integer] lhs 左のオペランド
-          # @param [Integer] rhs 右のオペランド
+          # @param lhs [Integer] 左のオペランド
+          # @param rhs [Integer] 右のオペランド
+          # @param round_type [Symbol] ゲームシステムの端数処理設定
           # @return [Integer] 演算の結果
-          def calc(lhs, rhs)
+          def calc(lhs, rhs, round_type)
             if rhs.zero?
               return 1
             end
 
-            return divide_and_round(lhs, rhs)
+            return divide_and_round(lhs, rhs, round_type)
           end
 
           # 除算および端数処理を行う
-          # @param [Integer] _dividend 被除数
-          # @param [Integer] _divisor 除数（0以外）
+          # @param dividend [Integer] 被除数
+          # @param divisor [Integer] 除数（0以外）
+          # @param round_type [Symbol] ゲームシステムの端数処理設定
           # @return [Integer]
-          def divide_and_round(_dividend, _divisor)
+          def divide_and_round(dividend, divisor, round_type)
             raise NotImplementedError
           end
         end
 
+        # 除算（端数処理はゲームシステム依存）のノード
+        class DivideWithGameSystemDefault < DivideBase
+          ROUNDING_METHOD = ""
+
+          private
+
+          # 除算および端数処理を行う
+          # @param dividend [Integer] 被除数
+          # @param divisor [Integer] 除数（0以外）
+          # @param round_type [Symbol] ゲームシステムの端数処理設定
+          # @return [Integer]
+          def divide_and_round(dividend, divisor, round_type)
+            case round_type
+            when RoundType::CEIL
+              (dividend.to_f / divisor).ceil
+            when RoundType::ROUND
+              (dividend.to_f / divisor).round
+            else # RoundType::FLOOR
+              dividend / divisor
+            end
+          end
+        end
+
         # 除算（切り上げ）のノード
         class DivideWithRoundingUp < DivideBase
           # 端数処理方法を示す記号
@@ -252,10 +286,9 @@ module BCDice
           private
 
           # 除算および端数処理を行う
-          # @param [Integer] dividend 被除数
-          # @param [Integer] divisor 除数（0以外）
+          # @param (see DivideWithGameSystemDefault#divide_and_round)
           # @return [Integer]
-          def divide_and_round(dividend, divisor)
+          def divide_and_round(dividend, divisor, _round_type)
             (dividend.to_f / divisor).ceil
           end
         end
@@ -268,10 +301,9 @@ module BCDice
           private
 
           # 除算および端数処理を行う
-          # @param [Integer] dividend 被除数
-          # @param [Integer] divisor 除数（0以外）
+          # @param (see DivideWithGameSystemDefault#divide_and_round)
           # @return [Integer]
-          def divide_and_round(dividend, divisor)
+          def divide_and_round(dividend, divisor, _round_type)
             (dividend.to_f / divisor).round
           end
         end
@@ -279,15 +311,14 @@ module BCDice
         # 除算（切り捨て）のノード
         class DivideWithRoundingDown < DivideBase
           # 端数処理方法を示す記号
-          ROUNDING_METHOD = ""
+          ROUNDING_METHOD = "F"
 
           private
 
           # 除算および端数処理を行う
-          # @param [Integer] dividend 被除数
-          # @param [Integer] divisor 除数（0以外）
+          # @param (see DivideWithGameSystemDefault#divide_and_round)
           # @return [Integer]
-          def divide_and_round(dividend, divisor)
+          def divide_and_round(dividend, divisor, _round_type)
             dividend / divisor
           end
         end
@@ -310,8 +341,8 @@ module BCDice
           #
           # @param [Randomizer] randomizer ランダマイザ
           # @return [Integer] 評価結果
-          def eval(randomizer)
-            -@body.eval(randomizer)
+          def eval(game_system, randomizer)
+            -@body.eval(game_system, randomizer)
           end
 
           # @return [Boolean]
@@ -321,8 +352,8 @@ module BCDice
 
           # 文字列に変換する
           # @return [String]
-          def to_s
-            "-#{@body}"
+          def expr(game_system)
+            "-#{@body.expr(game_system)}"
           end
 
           # メッセージへの出力を返す
@@ -344,8 +375,8 @@ module BCDice
           # @param [Number] times ダイスを振る回数のノード
           # @param [Number] sides ダイスの面数のノード
           def initialize(times, sides)
-            @times = times.eval(nil)
-            @sides = sides.eval(nil)
+            @times = times
+            @sides = sides
 
             # ダイスを振った結果の出力
             @text = nil
@@ -358,8 +389,11 @@ module BCDice
           #
           # @param [Randomizer] randomizer ランダマイザ
           # @return [Integer] 評価結果（出目の合計値）
-          def eval(randomizer)
-            dice_list = randomizer.roll(@times, @sides)
+          def eval(game_system, randomizer)
+            times = @times.eval(game_system, nil)
+            sides = eval_sides(game_system)
+
+            dice_list = randomizer.roll(times, sides)
 
             total = dice_list.sum()
             @text = "#{total}[#{dice_list.join(',')}]"
@@ -374,8 +408,11 @@ module BCDice
 
           # 文字列に変換する
           # @return [String]
-          def to_s
-            "#{@times}D#{@sides}"
+          def expr(game_system)
+            times = @times.eval(game_system, nil)
+            sides = eval_sides(game_system)
+
+            "#{times}D#{sides}"
           end
 
           # メッセージへの出力を返す
@@ -387,7 +424,32 @@ module BCDice
           # ノードのS式を返す
           # @return [String]
           def s_exp
-            "(DiceRoll #{@times} #{@sides})"
+            "(DiceRoll #{@times.s_exp} #{@sides.s_exp})"
+          end
+
+          private
+
+          def eval_sides(game_system)
+            @sides.eval(game_system, nil)
+          end
+        end
+
+        class ImplicitSidesDiceRoll < DiceRoll
+          # @param [Number] times ダイスを振る回数のノード
+          def initialize(times)
+            @times = times
+            @text = nil
+          end
+
+          # @return [String]
+          def s_exp
+            "(ImplicitSidesDiceRoll #{@times.s_exp})"
+          end
+
+          private
+
+          def eval_sides(game_system)
+            game_system.sides_implicit_d
           end
         end
 
@@ -430,14 +492,14 @@ module BCDice
           ).freeze
 
           # ノードを初期化する
-          # @param [Number] times ダイスを振る回数のノード
-          # @param [Number] sides ダイスの面数のノード
-          # @param [Number] n_filtering ダイスを残す/減らす個数のノード
+          # @param [Object] times ダイスを振る回数のノード
+          # @param [Object] sides ダイスの面数のノード
+          # @param [Object] n_filtering ダイスを残す/減らす個数のノード
           # @param [Filter] filter フィルタ
           def initialize(times, sides, n_filtering, filter)
-            @times = times.literal
-            @sides = sides.literal
-            @n_filtering = n_filtering.literal
+            @times = times
+            @sides = sides
+            @n_filtering = n_filtering
             @filter = filter
 
             # ダイスを振った結果の出力
@@ -451,10 +513,14 @@ module BCDice
           #
           # @param [Randomizer] randomizer ランダマイザ
           # @return [Integer] 評価結果（出目の合計値）
-          def eval(randomizer)
-            sorted_values = randomizer.roll(@times, @sides).sort
+          def eval(game_system, randomizer)
+            times = @times.eval(game_system, nil)
+            sides = @sides.eval(game_system, nil)
+            n_filtering = @n_filtering.eval(game_system, nil)
+
+            sorted_values = randomizer.roll(times, sides).sort
             total = @filter
-                    .apply[sorted_values, @n_filtering]
+                    .apply[sorted_values, n_filtering]
                     .sum()
 
             @text = "#{total}[#{sorted_values.join(',')}]"
@@ -469,8 +535,12 @@ module BCDice
 
           # 文字列に変換する
           # @return [String]
-          def to_s
-            "#{@times}D#{@sides}#{@filter.abbr}#{@n_filtering}"
+          def expr(game_system)
+            times = @times.eval(game_system, nil)
+            sides = @sides.eval(game_system, nil)
+            n_filtering = @n_filtering.eval(game_system, nil)
+
+            "#{times}D#{sides}#{@filter.abbr}#{n_filtering}"
           end
 
           # メッセージへの出力を返す
@@ -482,7 +552,7 @@ module BCDice
           # ノードのS式を返す
           # @return [String]
           def s_exp
-            "(DiceRollWithFilter #{@times} #{@sides} #{@filter.abbr.inspect} #{@n_filtering})"
+            "(DiceRollWithFilter #{@times.s_exp} #{@sides.s_exp} #{@filter.abbr.inspect} #{@n_filtering.s_exp})"
           end
         end
 
@@ -495,8 +565,8 @@ module BCDice
 
           # @param randomizer [Randomizer]
           # @return [integer]
-          def eval(randomizer)
-            @expr.eval(randomizer)
+          def eval(game_system, randomizer)
+            @expr.eval(game_system, randomizer)
           end
 
           # @return [Boolean]
@@ -505,8 +575,8 @@ module BCDice
           end
 
           # @return [String]
-          def to_s
-            "(#{@expr})"
+          def expr(game_system)
+            "(#{@expr.expr(game_system)})"
           end
 
           # @return [String]
@@ -540,7 +610,7 @@ module BCDice
 
           # ノードを評価する
           # @return [Integer] 格納している値
-          def eval(_randomizer)
+          def eval(_game_system, _randomizer)
             @literal
           end
 
@@ -551,12 +621,15 @@ module BCDice
 
           # 文字列に変換する
           # @return [String]
-          def to_s
+          def expr(_game_system)
+            @literal.to_s
+          end
+
+          def output
             @literal.to_s
           end
 
-          alias output to_s
-          alias s_exp to_s
+          alias s_exp output
         end
       end
     end

data/lib/bcdice/common_command/add_dice/parser.rb

@@ -48,47 +48,49 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    13,    16,    17,    18,    19,    13,    32,    13,     3,     8,
-     9,     4,    13,    12,    13,    26,     8,     9,    12,    13,
-    12,     8,     9,     8,     9,    12,    13,    12,     8,     9,
-    14,    13,    12,    13,    22,     8,     9,    13,    13,    12,
-     8,     9,     8,     9,    12,    15,    12,     8,     9,   nil,
-    12,    12,   nil,    16,    17,    16,    17,    18,    19,    18,
-    19,    34,    35,    38,    37,    40,    41,    42,    43 ]
+    13,    16,    17,    18,    19,     3,    32,    13,     4,    13,
+    14,     8,     9,    22,    13,    12,    13,    26,     8,     9,
+     8,     9,    12,    13,    12,     8,     9,     8,     9,    12,
+    13,    12,    13,   nil,     8,     9,    13,    13,    12,    13,
+   nil,     8,     9,     8,     9,    12,    15,    12,     8,     9,
+   nil,    12,    12,   nil,    12,   nil,    16,    17,    35,    37,
+    34,    36,    16,    17,    18,    19,    18,    19,    40,    39,
+    42,    43,    44,    45 ]
 
 racc_action_check = [
-    15,    23,    23,     6,     6,    22,    23,     2,     0,    15,
-    15,     1,     8,    15,     9,    15,     2,     2,    22,    12,
-     2,     8,     8,     9,     9,     8,    16,     9,    12,    12,
-     4,    17,    12,    18,    11,    16,    16,    36,    19,    16,
-    17,    17,    18,    18,    17,     5,    18,    19,    19,   nil,
-    36,    19,   nil,     5,     5,    25,    25,    27,    27,    28,
-    28,    30,    30,    31,    31,    37,    37,    38,    38 ]
+    15,    23,    23,     6,     6,     0,    23,     2,     1,     8,
+     4,    15,    15,    11,     9,    15,    12,    15,     2,     2,
+     8,     8,     2,    16,     8,     9,     9,    12,    12,     9,
+    17,    12,    18,   nil,    16,    16,    22,    19,    16,    38,
+   nil,    17,    17,    18,    18,    17,     5,    18,    19,    19,
+   nil,    22,    19,   nil,    38,   nil,     5,     5,    30,    30,
+    30,    30,    25,    25,    27,    27,    28,    28,    31,    31,
+    39,    39,    40,    40 ]
 
 racc_action_pointer = [
-     4,    11,     5,   nil,    30,    42,   -10,   nil,    10,    12,
-   nil,    29,    17,   nil,   nil,    -2,    24,    29,    31,    36,
-   nil,   nil,     3,   -10,   nil,    44,   nil,    44,    46,   nil,
-    52,    58,   nil,   nil,   nil,   nil,    35,    58,    60,   nil,
-   nil,   nil,   nil,   nil ]
+     1,     8,     5,   nil,    10,    43,   -12,   nil,     7,    12,
+   nil,     8,    14,   nil,   nil,    -2,    21,    28,    30,    35,
+   nil,   nil,    34,   -12,   nil,    49,   nil,    49,    51,   nil,
+    49,    63,   nil,   nil,   nil,   nil,   nil,   nil,    37,    63,
+    65,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-    -3,   -29,   -29,    -4,   -29,    -1,    -9,   -12,   -29,   -29,
-   -18,   -22,   -29,   -28,    44,   -29,   -29,   -29,   -29,   -29,
-   -16,   -17,   -20,   -29,    -2,    -5,    -6,    -7,    -8,   -10,
-   -13,   -19,   -27,   -11,   -14,   -15,   -29,   -29,   -29,   -21,
-   -23,   -24,   -25,   -26 ]
+    -3,   -31,   -31,    -4,   -31,    -1,    -9,   -12,   -31,   -31,
+   -20,   -24,   -31,   -30,    46,   -31,   -31,   -31,   -31,   -31,
+   -18,   -19,   -22,   -31,    -2,    -5,    -6,    -7,    -8,   -10,
+   -13,   -21,   -29,   -11,   -14,   -15,   -16,   -17,   -31,   -31,
+   -31,   -23,   -25,   -26,   -27,   -28 ]
 
 racc_goto_table = [
-    31,     1,     5,    27,    28,     2,    20,    21,    24,    33,
-    36,   nil,    23,   nil,    39,    25,    29,    30 ]
+    31,     5,    20,    21,    27,    28,     1,     2,    24,    33,
+    38,    23,    29,    30,    25,   nil,    41 ]
 
 racc_goto_check = [
-     9,     1,     3,     5,     5,     2,     6,     6,     4,     7,
-    10,   nil,     3,   nil,     9,     3,     6,     6 ]
+     9,     3,     6,     6,     5,     5,     1,     2,     4,     7,
+    10,     3,     6,     6,     3,   nil,     9 ]
 
 racc_goto_pointer = [
-   nil,     1,     5,     0,    -7,   -13,    -2,   -21,   nil,   -22,
+   nil,     6,     7,    -1,    -7,   -12,    -6,   -21,   nil,   -22,
    -21 ]
 
 racc_goto_default = [
@@ -97,38 +99,40 @@ racc_goto_default = [
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  2, 19, :_reduce_1,
-  4, 19, :_reduce_2,
-  0, 20, :_reduce_3,
-  1, 20, :_reduce_4,
-  1, 22, :_reduce_none,
-  1, 22, :_reduce_6,
-  3, 21, :_reduce_7,
-  3, 21, :_reduce_8,
-  1, 21, :_reduce_none,
-  3, 23, :_reduce_10,
-  4, 23, :_reduce_11,
-  1, 23, :_reduce_none,
-  0, 25, :_reduce_13,
-  1, 25, :_reduce_14,
-  1, 25, :_reduce_15,
-  2, 24, :_reduce_16,
-  2, 24, :_reduce_17,
+  2, 21, :_reduce_1,
+  4, 21, :_reduce_2,
+  0, 22, :_reduce_3,
+  1, 22, :_reduce_4,
   1, 24, :_reduce_none,
-  3, 26, :_reduce_19,
-  2, 26, :_reduce_20,
-  5, 26, :_reduce_21,
+  1, 24, :_reduce_6,
+  3, 23, :_reduce_7,
+  3, 23, :_reduce_8,
+  1, 23, :_reduce_none,
+  3, 25, :_reduce_10,
+  4, 25, :_reduce_11,
+  1, 25, :_reduce_none,
+  0, 27, :_reduce_13,
+  1, 27, :_reduce_14,
+  1, 27, :_reduce_15,
+  1, 27, :_reduce_16,
+  1, 27, :_reduce_17,
+  2, 26, :_reduce_18,
+  2, 26, :_reduce_19,
   1, 26, :_reduce_none,
-  2, 28, :_reduce_23,
-  2, 28, :_reduce_24,
-  2, 28, :_reduce_25,
-  2, 28, :_reduce_26,
-  3, 27, :_reduce_27,
-  1, 27, :_reduce_28 ]
+  3, 28, :_reduce_21,
+  2, 28, :_reduce_22,
+  5, 28, :_reduce_23,
+  1, 28, :_reduce_none,
+  2, 30, :_reduce_25,
+  2, 30, :_reduce_26,
+  2, 30, :_reduce_27,
+  2, 30, :_reduce_28,
+  3, 29, :_reduce_29,
+  1, 29, :_reduce_30 ]
 
-racc_reduce_n = 29
+racc_reduce_n = 31
 
-racc_shift_n = 44
+racc_shift_n = 46
 
 racc_token_table = {
   false => 0,
@@ -142,15 +146,17 @@ racc_token_table = {
   :L => 8,
   :U => 9,
   :R => 10,
-  :PLUS => 11,
-  :MINUS => 12,
-  :ASTERISK => 13,
-  :SLASH => 14,
-  :PARENL => 15,
-  :PARENR => 16,
-  :QUESTION => 17 }
-
-racc_nt_base = 18
+  :F => 11,
+  :C => 12,
+  :PLUS => 13,
+  :MINUS => 14,
+  :ASTERISK => 15,
+  :SLASH => 16,
+  :PARENL => 17,
+  :PARENR => 18,
+  :QUESTION => 19 }
+
+racc_nt_base = 20
 
 racc_use_result_var = true
 
@@ -182,6 +188,8 @@ Racc_token_to_s_table = [
   "L",
   "U",
   "R",
+  "F",
+  "C",
   "PLUS",
   "MINUS",
   "ASTERISK",
@@ -280,35 +288,45 @@ end
 # reduce 12 omitted
 
 def _reduce_13(val, _values, result)
- result = Node::DivideWithRoundingDown
+ result = Node::DivideWithGameSystemDefault
     result
 end
 
 def _reduce_14(val, _values, result)
- result = Node::DivideWithRoundingUp
+ result = Node::DivideWithRoundingDown
     result
 end
 
 def _reduce_15(val, _values, result)
- result = Node::DivideWithRoundingOff
+ result = Node::DivideWithRoundingUp
     result
 end
 
 def _reduce_16(val, _values, result)
- result = val[1]
+ result = Node::DivideWithRoundingUp
     result
 end
 
 def _reduce_17(val, _values, result)
+ result = Node::DivideWithRoundingOff
+    result
+end
+
+def _reduce_18(val, _values, result)
+ result = val[1]
+    result
+end
+
+def _reduce_19(val, _values, result)
          body = val[1]
          result = body.is_a?(Node::Negate) ? body.body : Node::Negate.new(body)
 
     result
 end
 
-# reduce 18 omitted
+# reduce 20 omitted
 
-def _reduce_19(val, _values, result)
+def _reduce_21(val, _values, result)
         times = val[0]
         sides = val[2]
         raise ParseError if times.include_dice? || sides.include_dice?
@@ -318,17 +336,16 @@ def _reduce_19(val, _values, result)
     result
 end
 
-def _reduce_20(val, _values, result)
+def _reduce_22(val, _values, result)
         times = val[0]
-        sides = Node::Number.new(6)
         raise ParseError if times.include_dice?
 
-        result = Node::DiceRoll.new(times, sides)
+        result = Node::ImplicitSidesDiceRoll.new(times)
 
     result
 end
 
-def _reduce_21(val, _values, result)
+def _reduce_23(val, _values, result)
         times = val[0]
         sides = val[2]
         filter = val[3]
@@ -340,34 +357,34 @@ def _reduce_21(val, _values, result)
     result
 end
 
-# reduce 22 omitted
+# reduce 24 omitted
 
-def _reduce_23(val, _values, result)
+def _reduce_25(val, _values, result)
  result = Node::DiceRollWithFilter::KEEP_HIGHEST
     result
 end
 
-def _reduce_24(val, _values, result)
+def _reduce_26(val, _values, result)
  result = Node::DiceRollWithFilter::KEEP_LOWEST
     result
 end
 
-def _reduce_25(val, _values, result)
+def _reduce_27(val, _values, result)
  result = Node::DiceRollWithFilter::DROP_HIGHEST
     result
 end
 
-def _reduce_26(val, _values, result)
+def _reduce_28(val, _values, result)
  result = Node::DiceRollWithFilter::DROP_LOWEST
     result
 end
 
-def _reduce_27(val, _values, result)
+def _reduce_29(val, _values, result)
  result = Node::Parenthesis.new(val[1])
     result
 end
 
-def _reduce_28(val, _values, result)
+def _reduce_30(val, _values, result)
  result = Node::Number.new(val[0])
     result
 end