AddDiceのPREFIX_PATTERNをより厳密に (#407)

* AddDiceのPREFIX_PATTERNをより厳密に * テストケースの追加
bcdice · Apr 4, 2021 · e997ab4 · e997ab4
1 parent cfee15a
commit e997ab4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/lib/bcdice/common_command/add_dice.rb b/lib/bcdice/common_command/add_dice.rb
@@ -7,7 +7,7 @@
 module BCDice
   module CommonCommand
     module AddDice
-      PREFIX_PATTERN = /[+\-\dD(]+/.freeze
+      PREFIX_PATTERN = /[+\-(]*\d+/.freeze
 
       class << self
         def eval(command, game_system, randomizer)

diff --git a/test/test_base.rb b/test/test_base.rb
@@ -9,7 +9,7 @@ class DummySystem < BCDice::Base
 
 class TestBase < Test::Unit::TestCase
   def test_command_pattern
-    assert_equal(/^S?([+\-\dD(]+|\d+B\d+|C|choice|D66|(repeat|rep|x)\d+|\d+R\d+|\d+U\d+|BCDiceVersion|ABC|XYZ|IP\d+)/i, DummySystem.command_pattern)
+    assert_equal(/^S?([+\-(]*\d+|\d+B\d+|C|choice|D66|(repeat|rep|x)\d+|\d+R\d+|\d+U\d+|BCDiceVersion|ABC|XYZ|IP\d+)/i, DummySystem.command_pattern)
 
     assert_match(DummySystem.command_pattern, "ABC+123")
     assert_match(DummySystem.command_pattern, "XYZ[hoge]")
@@ -31,5 +31,8 @@ def test_command_pattern
     assert_not_match(DummySystem.command_pattern, "[1...3]D100<=70")
     assert_match(DummySystem.command_pattern, "-3+2D100<=70")
     assert_match(DummySystem.command_pattern, "+3+2D100<=70")
+    assert_not_match(DummySystem.command_pattern, "D6")
+    assert_not_match(DummySystem.command_pattern, "+-")
+    assert_match(DummySystem.command_pattern, "+(---(-3+1))D")
   end
 end
diff --git a/test/test_sai_fic_skill_table.rb b/test/test_sai_fic_skill_table.rb
@@ -12,6 +12,6 @@ class DummySystem < BCDice::Base
   end
 
   def test_command_pattern
-    assert_equal(/^S?([+\-\dD(]+|\d+B\d+|C|choice|D66|(repeat|rep|x)\d+|\d+R\d+|\d+U\d+|BCDiceVersion|RTT[1-6]?|RCT)/i, DummySystem.command_pattern)
+    assert_equal(/^S?([+\-(]*\d+|\d+B\d+|C|choice|D66|(repeat|rep|x)\d+|\d+R\d+|\d+U\d+|BCDiceVersion|RTT[1-6]?|RCT)/i, DummySystem.command_pattern)
   end
 end