bcdice 3.0.0.pre.alpha.2 → 3.0.0.pre.rc.1

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

@@ -1,4 +1,5 @@
 require "bcdice/format"
+require "bcdice/common_command/barabara_dice/result"
 
 module BCDice
   module CommonCommand
@@ -12,7 +13,9 @@ module BCDice
             @target_number = target_number
           end
 
-          # @return [String, nil]
+          # @param game_system [Base] ゲームシステム
+          # @param randomizer [Randomizer] ランダマイザ
+          # @return [Result]
           def eval(game_system, randomizer)
             round_type = game_system.round_type
             notations = @notations.map { |n| n.to_dice(round_type) }
@@ -38,6 +41,9 @@ 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.success_num = success_num
             end
           end
         end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "bcdice/result"
+
+module BCDice
+  module CommonCommand
+    module BarabaraDice
+      # バラバラロールの結果を表すクラス
+      class Result < ::BCDice::Result
+        # @return [Integer] 成功数
+        attr_accessor :success_num
+
+        # @param text [String, nil] 結果の文章
+        def initialize(text = nil)
+          super(text)
+
+          @success_num = 0
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "bcdice/arithmetic/node"
+
 module BCDice
   module CommonCommand
     module Calc
@@ -18,9 +20,16 @@ module BCDice
                 "ゼロ除算が発生したため計算できませんでした"
               end
 
+            output =
+              if @expr.is_a?(Arithmetic::Node::Parenthesis)
+                @expr.output
+              else
+                "(#{@expr.output})"
+              end
+
             Result.new.tap do |r|
               r.secret = @secret
-              r.text = "計算結果 ＞ #{value}"
+              r.text = "c#{output} ＞ #{value}"
             end
           end
         end

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

@@ -252,7 +252,7 @@ end
 # reduce 17 omitted
 
 def _reduce_18(val, _values, result)
- result = val[1]
+ result = Arithmetic::Node::Parenthesis.new(val[1])
     result
 end
 

data/lib/bcdice/common_command/d66_dice.rb

@@ -18,7 +18,7 @@ module BCDice
         def parse(command, game_system)
           command = command.split(" ", 2).first
 
-          m = /^(S)?D66([ANS])?$/i.match(command)
+          m = /^(S)?D66([ANSD])?$/i.match(command)
           return nil unless m
 
           new(
@@ -32,6 +32,8 @@ module BCDice
           case suffix
           when "A", "S"
             D66SortType::ASC
+          when "D"
+            D66SortType::DESC
           when "N"
             D66SortType::NO_SORT
           end

data/lib/bcdice/common_command/lexer.rb

@@ -20,7 +20,8 @@ module BCDice
       }.freeze
 
       def initialize(source)
-        source = source.split(" ", 2).first
+        # sourceが空文字だとString#splitが空になる
+        source = source.split(" ", 2).first || ""
         @scanner = StringScanner.new(source)
       end
 

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

@@ -36,64 +36,66 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-     9,     9,    33,    34,     3,     9,     9,    20,    21,    44,
-     8,     8,    20,    21,     9,     8,     8,    13,    14,     9,
-    20,    21,     4,    15,     8,    20,    21,     9,    10,     8,
-    33,    34,     9,    20,    21,    35,    16,     8,    20,    21,
-     9,    24,     8,    26,    14,     9,    20,    21,    36,    37,
-     8,    20,    21,     9,    41,     8,    33,    34,     9,    20,
-    21,    33,    34,     8,    20,    21,     9,    24,     8,    33,
-    34,     9,    20,    21,    36,    37,     8,    20,    21,     9,
-    16,     8,    36,    37,   nil,    20,    21,    33,    34,     8,
-    53,    51,    52,    54 ]
+     9,     9,    36,    37,     3,     9,     9,    21,    22,    49,
+     8,     8,    21,    22,     9,     8,     8,    14,    15,     9,
+    21,    22,     4,    16,     8,    21,    22,     9,    10,     8,
+    36,    37,     9,    21,    22,    38,    17,     8,    21,    22,
+     9,    25,     8,    27,    15,     9,    21,    22,    28,    29,
+     8,    21,    22,     9,    44,     8,    39,    40,     9,    21,
+    22,    39,    40,     8,    21,    22,     9,    25,     8,    39,
+    40,     9,    21,    22,    36,    37,     8,    21,    22,     9,
+    17,     8,    39,    40,     9,    21,    22,    39,    40,     8,
+    21,    22,     9,   nil,     8,    39,    40,   nil,    21,    22,
+    39,    40,     8,    58,    56,    57,    59,    36,    37 ]
 
 racc_action_check = [
-     2,     8,    31,    31,     0,    16,    13,     8,     8,    31,
-     2,     8,    13,    13,    14,    16,    13,     5,     5,    15,
-    14,    14,     1,     5,    14,    15,    15,    20,     4,    15,
-    17,    17,    21,    20,    20,    17,     7,    20,    21,    21,
-    24,    11,    21,    12,    12,    26,    24,    24,    18,    18,
-    24,    26,    26,    33,    23,    26,    27,    27,    34,    33,
-    33,    30,    30,    33,    34,    34,    36,    25,    34,    42,
-    42,    37,    36,    36,    45,    45,    36,    37,    37,    41,
-    29,    37,    46,    46,   nil,    41,    41,    49,    49,    41,
-    48,    48,    48,    48 ]
+     2,     8,    34,    34,     0,    17,    14,     8,     8,    34,
+     2,     8,    14,    14,    15,    17,    14,     5,     5,    16,
+    15,    15,     1,     5,    15,    16,    16,    21,     4,    16,
+    18,    18,    22,    21,    21,    18,     7,    21,    22,    22,
+    25,    11,    22,    12,    12,    27,    25,    25,    13,    13,
+    25,    27,    27,    28,    24,    27,    19,    19,    29,    28,
+    28,    30,    30,    28,    29,    29,    36,    26,    29,    33,
+    33,    37,    36,    36,    45,    45,    36,    37,    37,    39,
+    32,    37,    47,    47,    40,    39,    39,    48,    48,    39,
+    40,    40,    44,   nil,    40,    50,    50,   nil,    44,    44,
+    51,    51,    44,    53,    53,    53,    53,    54,    54 ]
 
 racc_action_pointer = [
     -3,    22,    -2,   nil,    28,     9,   nil,    32,    -1,   nil,
-   nil,    20,    35,     4,    12,    17,     3,    22,    38,   nil,
-    25,    30,   nil,    34,    38,    46,    43,    48,   nil,    76,
-    53,    -6,   nil,    51,    56,   nil,    64,    69,   nil,   nil,
-   nil,    77,    61,   nil,   nil,    64,    72,   nil,    87,    79,
-   nil,   nil,   nil,   nil,   nil ]
+   nil,    20,    35,    40,     4,    12,    17,     3,    22,    46,
+   nil,    25,    30,   nil,    34,    38,    46,    43,    51,    56,
+    51,   nil,    76,    59,    -6,   nil,    64,    69,   nil,    77,
+    82,   nil,   nil,   nil,    90,    66,   nil,    72,    77,   nil,
+    85,    90,   nil,   100,    99,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-    -4,   -32,   -32,    -5,   -32,    -6,   -14,   -32,   -32,   -31,
-    55,    -9,    -6,   -32,   -32,   -32,   -32,   -32,   -18,   -21,
-   -32,   -32,   -29,    -1,   -32,    -9,   -32,    -7,   -13,   -29,
-    -8,   -32,   -15,   -32,   -32,   -30,   -32,   -32,   -27,   -28,
-    -3,   -32,   -10,    -2,   -11,   -16,   -17,   -19,   -22,   -12,
-   -20,   -23,   -24,   -25,   -26 ]
+    -4,   -35,   -35,    -5,   -35,    -6,   -17,   -35,   -35,   -34,
+    60,   -12,    -6,    -7,   -35,   -35,   -35,   -35,   -35,   -21,
+   -24,   -35,   -35,   -32,    -1,   -35,   -12,   -35,   -35,   -35,
+    -8,   -16,   -32,    -9,   -35,   -18,   -35,   -35,   -33,   -35,
+   -35,   -30,   -31,    -3,   -35,   -13,    -2,   -10,   -11,   -14,
+   -19,   -20,   -22,   -25,   -15,   -23,   -26,   -27,   -28,   -29 ]
 
 racc_goto_table = [
-    17,    38,    39,     6,    11,    23,    30,    31,     1,     7,
-     2,    25,    45,    46,    28,     5,    42,    47,    48,    43,
-    29,    12,    40,    32,    50,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    49 ]
+    18,    30,    33,    41,    42,    24,     6,     1,    34,     2,
+     5,    12,    11,     7,    30,    47,    48,    45,    31,    26,
+    46,    52,    53,    50,    51,    32,    43,    55,    35,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    54 ]
 
 racc_goto_check = [
-     8,    12,    12,     9,     4,     5,     8,     8,     1,    10,
-     2,     4,    11,    11,     9,     3,     8,    12,    12,     5,
-    10,     6,     7,    10,    13,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,     8 ]
+    10,     9,     9,    13,    13,     5,    11,     1,    10,     2,
+     3,     6,     4,    12,     9,     9,     9,    10,    11,     4,
+     5,    13,    13,     9,     9,    12,     7,    14,    12,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    10 ]
 
 racc_goto_pointer = [
-   nil,     8,    10,    13,    -1,    -6,    16,    -1,    -8,     1,
-     7,   -21,   -19,   -24 ]
+   nil,     7,     9,     8,     7,    -6,     6,     2,   nil,   -13,
+    -8,     4,    11,   -18,   -26 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    27,   nil,
-    22,    18,    19,   nil ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    13,    19,
+   nil,   nil,    23,    20,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -103,35 +105,38 @@ racc_reduce_table = [
   0, 24, :_reduce_4,
   1, 24, :_reduce_5,
   0, 26, :_reduce_6,
-  2, 26, :_reduce_7,
-  2, 26, :_reduce_8,
-  0, 27, :_reduce_9,
-  2, 27, :_reduce_10,
-  3, 28, :_reduce_11,
-  2, 29, :_reduce_12,
-  3, 25, :_reduce_13,
-  1, 25, :_reduce_14,
-  3, 31, :_reduce_15,
-  3, 30, :_reduce_16,
-  3, 30, :_reduce_17,
-  1, 30, :_reduce_none,
-  3, 33, :_reduce_19,
-  4, 33, :_reduce_20,
-  1, 33, :_reduce_none,
-  0, 35, :_reduce_22,
-  1, 35, :_reduce_23,
-  1, 35, :_reduce_24,
-  1, 35, :_reduce_25,
-  1, 35, :_reduce_26,
-  2, 34, :_reduce_27,
-  2, 34, :_reduce_28,
-  1, 34, :_reduce_none,
-  3, 32, :_reduce_30,
-  1, 32, :_reduce_31 ]
-
-racc_reduce_n = 32
-
-racc_shift_n = 55
+  1, 26, :_reduce_7,
+  2, 30, :_reduce_8,
+  2, 30, :_reduce_9,
+  3, 30, :_reduce_10,
+  3, 30, :_reduce_11,
+  0, 27, :_reduce_12,
+  2, 27, :_reduce_13,
+  3, 28, :_reduce_14,
+  2, 29, :_reduce_15,
+  3, 25, :_reduce_16,
+  1, 25, :_reduce_17,
+  3, 33, :_reduce_18,
+  3, 32, :_reduce_19,
+  3, 32, :_reduce_20,
+  1, 32, :_reduce_none,
+  3, 31, :_reduce_22,
+  4, 31, :_reduce_23,
+  1, 31, :_reduce_none,
+  0, 36, :_reduce_25,
+  1, 36, :_reduce_26,
+  1, 36, :_reduce_27,
+  1, 36, :_reduce_28,
+  1, 36, :_reduce_29,
+  2, 35, :_reduce_30,
+  2, 35, :_reduce_31,
+  1, 35, :_reduce_none,
+  3, 34, :_reduce_33,
+  1, 34, :_reduce_34 ]
+
+racc_reduce_n = 35
+
+racc_shift_n = 60
 
 racc_token_table = {
   false => 0,
@@ -208,10 +213,11 @@ Racc_token_to_s_table = [
   "target",
   "bracket",
   "at",
+  "modifier_expr",
+  "mul",
   "add",
   "dice",
   "term",
-  "mul",
   "unary",
   "round_type" ]
 
@@ -275,21 +281,36 @@ def _reduce_6(val, _values, result)
 end
 
 def _reduce_7(val, _values, result)
- result = val[1]
+ result = val[0]
     result
 end
 
 def _reduce_8(val, _values, result)
- result = Arithmetic::Node::Negative.new(val[1])
+ result = val[1]
     result
 end
 
 def _reduce_9(val, _values, result)
- result = {}
+ result = Arithmetic::Node::Negative.new(val[1])
     result
 end
 
 def _reduce_10(val, _values, result)
+ result = Arithmetic::Node::BinaryOp.new(val[0], :+, val[2])
+    result
+end
+
+def _reduce_11(val, _values, result)
+ result = Arithmetic::Node::BinaryOp.new(val[0], :-, val[2])
+    result
+end
+
+def _reduce_12(val, _values, result)
+ result = {}
+    result
+end
+
+def _reduce_13(val, _values, result)
             cmp_op, target = val
             raise ParseError unless cmp_op
 
@@ -298,17 +319,17 @@ def _reduce_10(val, _values, result)
     result
 end
 
-def _reduce_11(val, _values, result)
+def _reduce_14(val, _values, result)
  result = val[1]
     result
 end
 
-def _reduce_12(val, _values, result)
+def _reduce_15(val, _values, result)
  result = val[1]
     result
 end
 
-def _reduce_13(val, _values, result)
+def _reduce_16(val, _values, result)
                notations = val[0]
                notations.push(val[2])
                result = notations
@@ -316,12 +337,12 @@ def _reduce_13(val, _values, result)
     result
 end
 
-def _reduce_14(val, _values, result)
+def _reduce_17(val, _values, result)
  result = [val[0]]
     result
 end
 
-def _reduce_15(val, _values, result)
+def _reduce_18(val, _values, result)
           times = val[0]
           sides = val[2]
           result = UpperDice::Node::Notation.new(times, sides)
@@ -329,75 +350,75 @@ def _reduce_15(val, _values, result)
     result
 end
 
-def _reduce_16(val, _values, result)
+def _reduce_19(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :+, val[2])
     result
 end
 
-def _reduce_17(val, _values, result)
+def _reduce_20(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :-, val[2])
     result
 end
 
-# reduce 18 omitted
+# reduce 21 omitted
 
-def _reduce_19(val, _values, result)
+def _reduce_22(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :*, val[2])
     result
 end
 
-def _reduce_20(val, _values, result)
+def _reduce_23(val, _values, result)
          divied_class = val[3]
          result = divied_class.new(val[0], val[2])
 
     result
 end
 
-# reduce 21 omitted
+# reduce 24 omitted
 
-def _reduce_22(val, _values, result)
+def _reduce_25(val, _values, result)
  result = Arithmetic::Node::DivideWithGameSystemDefault
     result
 end
 
-def _reduce_23(val, _values, result)
+def _reduce_26(val, _values, result)
  result = Arithmetic::Node::DivideWithCeil
     result
 end
 
-def _reduce_24(val, _values, result)
+def _reduce_27(val, _values, result)
  result = Arithmetic::Node::DivideWithCeil
     result
 end
 
-def _reduce_25(val, _values, result)
+def _reduce_28(val, _values, result)
  result = Arithmetic::Node::DivideWithRound
     result
 end
 
-def _reduce_26(val, _values, result)
+def _reduce_29(val, _values, result)
  result = Arithmetic::Node::DivideWithFloor
     result
 end
 
-def _reduce_27(val, _values, result)
+def _reduce_30(val, _values, result)
  result = val[1]
     result
 end
 
-def _reduce_28(val, _values, result)
+def _reduce_31(val, _values, result)
  result = Arithmetic::Node::Negative.new(val[1])
     result
 end
 
-# reduce 29 omitted
+# reduce 32 omitted
 
-def _reduce_30(val, _values, result)
+def _reduce_33(val, _values, result)
  result = val[1]
     result
 end
 
-def _reduce_31(val, _values, result)
+def _reduce_34(val, _values, result)
  result = Arithmetic::Node::Number.new(val[0])
     result
 end