Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SaiFicSkillTableのcommand_patternがRuby依存にならないように #401

Merged
merged 2 commits into from
Mar 28, 2021
Merged

SaiFicSkillTableのcommand_patternがRuby依存にならないように #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90d9211
`[1...3]`の形式は削除されたのでマッチしないようにする
ysakasin Mar 28, 2021
1eb03a9
SaiFicSkillTableのcommand_patternがRuby依存にならないように
ysakasin Mar 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/bcdice/common_command/add_dice.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
module BCDice
module CommonCommand
module AddDice
PREFIX_PATTERN = /[+\-\dD(\[]+/.freeze
PREFIX_PATTERN = /[+\-\dD(]+/.freeze

class << self
def eval(command, game_system, randomizer)
Expand Down
2 changes: 1 addition & 1 deletion lib/bcdice/dice_table/sai_fic_skill_table.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def roll_skill(randomizer)
end

def prefixes
([/RTT[1-6]?/i, "RCT", @rtt, @rct] + @rttn).compact
(["RTT[1-6]?", "RCT", @rtt, @rct] + @rttn).compact
end

private
Expand Down
38 changes: 19 additions & 19 deletions test/test_base.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ 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?([+\-\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(DummySystem.command_pattern.match?("ABC+123"))
assert(DummySystem.command_pattern.match?("XYZ[hoge]"))
assert(DummySystem.command_pattern.match?("IP900+1000"))
assert_false(DummySystem.command_pattern.match?("IP+1000"))
assert_false(DummySystem.command_pattern.match?("EFG"))
assert_match(DummySystem.command_pattern, "ABC+123")
assert_match(DummySystem.command_pattern, "XYZ[hoge]")
assert_match(DummySystem.command_pattern, "IP900+1000")
assert_not_match(DummySystem.command_pattern, "IP+1000")
assert_not_match(DummySystem.command_pattern, "EFG")

assert(DummySystem.command_pattern.match?("1D100<=70"))
assert(DummySystem.command_pattern.match?("4D6+2D8"))
assert(DummySystem.command_pattern.match?("4B6+2B8"))
assert(DummySystem.command_pattern.match?("C2+4*3/2"))
assert(DummySystem.command_pattern.match?("choice[うさぎ,かめ]"))
assert(DummySystem.command_pattern.match?("D66s"))
assert(DummySystem.command_pattern.match?("1R10+5R6"))
assert(DummySystem.command_pattern.match?("1U10+2U20"))
assert(DummySystem.command_pattern.match?("bcdiceversion"))
assert_match(DummySystem.command_pattern, "1D100<=70")
assert_match(DummySystem.command_pattern, "4D6+2D8")
assert_match(DummySystem.command_pattern, "4B6+2B8")
assert_match(DummySystem.command_pattern, "C2+4*3/2")
assert_match(DummySystem.command_pattern, "choice[うさぎ,かめ]")
assert_match(DummySystem.command_pattern, "D66s")
assert_match(DummySystem.command_pattern, "1R10+5R6")
assert_match(DummySystem.command_pattern, "1U10+2U20")
assert_match(DummySystem.command_pattern, "bcdiceversion")

assert(DummySystem.command_pattern.match?("(1+2)D100<=70"))
assert(DummySystem.command_pattern.match?("[1...3]D100<=70"))
assert(DummySystem.command_pattern.match?("-3+2D100<=70"))
assert(DummySystem.command_pattern.match?("+3+2D100<=70"))
assert_match(DummySystem.command_pattern, "(1+2)D100<=70")
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")
end
end
17 changes: 17 additions & 0 deletions test/test_sai_fic_skill_table.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# frozen_string_literal: true

require "test/unit"
require "bcdice"
require "bcdice/dice_table/sai_fic_skill_table"

class TestSaiFicSkillTable < Test::Unit::TestCase
class DummySystem < BCDice::Base
table = BCDice::DiceTable::SaiFicSkillTable.new([])

register_prefix(table.prefixes)
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)
end
end