Commit bff952a

committed

allow RegexpTrie.new(patterns).to_source

1 parent f6e27a9 commit bff952aCopy full SHA for bff952a

File tree

+24

-11

lines changed

+24

-11

lines changed

Lines changed: 16 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,20 +6,20 @@ class RegexpTrie`
`6`	`6`	`# @param [Fixnum,Boolean] option The second argument of Regexp.new()`
`7`	`7`	`# @return [Regexp]`
`8`	`8`	`def self.union(*strings, option: nil)`
`9`		`- rt = new`
`10`		`- strings.flatten.each do \|arg\|`
`11`		`- rt.add(arg)`
`12`		`- end`
`13`		`- rt.to_regexp(option)`
	`9`	`+ new(*strings).to_regexp(option)`
`14`	`10`	`end`
`15`	`11`
`16`		`- def initialize`
	`12`	`+ def initialize(*strings)`
`17`	`13`	`@head = {}`
	`14`	`+`
	`15`	`+ strings.flatten.each do \|str\|`
	`16`	`+ add(str)`
	`17`	`+ end`
`18`	`18`	`end`
`19`	`19`
`20`	`20`	`# @param [String] str`
`21`	`21`	`def add(str)`
`22`		`- return self unlessstr && str.size > 0`
	`22`	`+ return self if !str \|\| str.empty?`
`23`	`23`
`24`	`24`	`entry = @head`
`25`	`25`	`str.each_char do \|c\|`
`@@ -30,15 +30,20 @@ def add(str)`
`30`	`30`	`self`
`31`	`31`	`end`
`32`	`32`
`33`		`- # @return [Regexp]`
`34`		`- def to_regexp(option=nil)`
	`33`	`+ # @return [String]`
	`34`	`+ def to_source`
`35`	`35`	`if @head.empty?`
`36`		`- Regexp.union`
	`36`	`+ Regexp.union.source`
`37`	`37`	`else`
`38`		`- Regexp.new(build(@head),option)`
	`38`	`+ build(@head)`
`39`	`39`	`end`
`40`	`40`	`end`
`41`	`41`
	`42`	`+ # @return [Regexp]`
	`43`	`+ def to_regexp(option = nil)`
	`44`	`+ Regexp.new(to_source, option)`
	`45`	`+ end`
	`46`	`+`
`42`	`47`	`private`
`43`	`48`
`44`	`49`	`def build(entry)`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,14 @@ def test_union_rx`
`49`	`49`	`assert { RegexpTrie.union('foo', 'bar', 'baz') == /(?:foo\|ba[rz])/ }`
`50`	`50`	`end`
`51`	`51`
	`52`	`+ def test_union_source`
	`53`	`+ assert { RegexpTrie.new('a').to_source == 'a' }`
	`54`	`+ assert { RegexpTrie.new('a', 'aa').to_source == 'aa?' }`
	`55`	`+ assert { RegexpTrie.new('a', 'b').to_source == '[ab]' }`
	`56`	`+ assert { RegexpTrie.new('foo', 'bar').to_source == '(?:foo\|bar)' }`
	`57`	`+ assert { RegexpTrie.new('foo', 'bar', 'baz').to_source == '(?:foo\|ba[rz])' }`
	`58`	`+ end`
	`59`	`+`
`52`	`60`	`def test_union_empty`
`53`	`61`	`assert { RegexpTrie.union == Regexp.union }`
`54`	`62`	`end`

Comments

(0)