Skip to content

Commit

Permalink
editing..
Browse files Browse the repository at this point in the history
  • Loading branch information
@masui
masui committed Apr 30, 2012
1 parent 6bbc140 commit fc0549f
Show file tree
Hide file tree
Showing 9 changed files with 48 additions and 64 deletions.
4 changes: 0 additions & 4 deletions lib/Generator.rb
View file
Expand Up @@ -114,10 +114,6 @@ def generate(pat, app = nil)
patstr = (["(.*)"] * sslen).join("\t")
/#{patstr}/ =~ ss.join("\t")
end
## next if $1 == $2
#File.open("/tmp/log","a"){ |f|
# f.puts "#{s}-----" + eval('%('+@commands[acceptno]+')')
#}
# 'set date #{$2}' のような記述の$変数にsubstringの値を代入
res[ambig] << [s, eval('%('+@commands[acceptno]+')')]
end
Expand Down
24 changes: 12 additions & 12 deletions lib/re_expand.rb
View file
Expand Up @@ -15,32 +15,32 @@ class String
# ExpandHelp用のライブラリを利用
def expand(filterpat=' ')
g = ReExpand::Generator.new
g.add(self,'')
g.add(self,"\#{$1}\t\#{$2}\t\#{$3}\t\#{$4}\t\#{$5}\t\#{$6}\t\#{$7}\t\#{$8}\t\#{$9}")
strings = []
#if filterpat.class == Regexp && block then
# g.generate(' ',block)
# return
if filterpat.class == String then
matched = g.generate(filterpat)
res = matched[0].length > 0 ? matched[0] : matched[1].length > 0 ? matched[1] : matched[2]
strings = res.collect { |r|
m = g.generate(filterpat)
matched = m[0].length > 0 ? m[0] : m[1].length > 0 ? m[1] : m[2]
strings = matched.collect { |r|
r[0]
}
else
matched = g.generate(' ')
strings = matched[0].collect { |r|
r[0]
}
matched = g.generate(' ')[0]
if filterpat.class == Regexp then
strings = strings.find_all { |s|
filterpat.match(s)
matched = matched.find_all { |r|
filterpat.match(r[0])
}
end
strings = matched.collect { |r|
r[0]
}
end

if block_given? then
strings.each { |string|
yield string
matched.collect { |m|
yield m[0], m[1].split(/\t/)
}
else
strings
Expand Down
4 changes: 0 additions & 4 deletions pkg/re_expand-0.0.1/lib/Generator.rb
View file
Expand Up @@ -114,10 +114,6 @@ def generate(pat, app = nil)
patstr = (["(.*)"] * sslen).join("\t")
/#{patstr}/ =~ ss.join("\t")
end
## next if $1 == $2
#File.open("/tmp/log","a"){ |f|
# f.puts "#{s}-----" + eval('%('+@commands[acceptno]+')')
#}
# 'set date #{$2}' のような記述の$変数にsubstringの値を代入
res[ambig] << [s, eval('%('+@commands[acceptno]+')')]
end
Expand Down
24 changes: 12 additions & 12 deletions pkg/re_expand-0.0.1/lib/re_expand.rb
View file
Expand Up @@ -15,32 +15,32 @@ class String
# ExpandHelp用のライブラリを利用
def expand(filterpat=' ')
g = ReExpand::Generator.new
g.add(self,'')
g.add(self,"\#{$1}\t\#{$2}\t\#{$3}\t\#{$4}\t\#{$5}\t\#{$6}\t\#{$7}\t\#{$8}\t\#{$9}")
strings = []
#if filterpat.class == Regexp && block then
# g.generate(' ',block)
# return
if filterpat.class == String then
matched = g.generate(filterpat)
res = matched[0].length > 0 ? matched[0] : matched[1].length > 0 ? matched[1] : matched[2]
strings = res.collect { |r|
m = g.generate(filterpat)
matched = m[0].length > 0 ? m[0] : m[1].length > 0 ? m[1] : m[2]
strings = matched.collect { |r|
r[0]
}
else
matched = g.generate(' ')
strings = matched[0].collect { |r|
r[0]
}
matched = g.generate(' ')[0]
if filterpat.class == Regexp then
strings = strings.find_all { |s|
filterpat.match(s)
matched = matched.find_all { |r|
filterpat.match(r[0])
}
end
strings = matched.collect { |r|
r[0]
}
end

if block_given? then
strings.each { |string|
yield string
matched.collect { |m|
yield m[0], m[1].split(/\t/)
}
else
strings
Expand Down
4 changes: 0 additions & 4 deletions pkg/re_expand-0.0.2/lib/Generator.rb
View file
Expand Up @@ -114,10 +114,6 @@ def generate(pat, app = nil)
patstr = (["(.*)"] * sslen).join("\t")
/#{patstr}/ =~ ss.join("\t")
end
## next if $1 == $2
#File.open("/tmp/log","a"){ |f|
# f.puts "#{s}-----" + eval('%('+@commands[acceptno]+')')
#}
# 'set date #{$2}' のような記述の$変数にsubstringの値を代入
res[ambig] << [s, eval('%('+@commands[acceptno]+')')]
end
Expand Down
24 changes: 12 additions & 12 deletions pkg/re_expand-0.0.2/lib/re_expand.rb
View file
Expand Up @@ -15,32 +15,32 @@ class String
# ExpandHelp用のライブラリを利用
def expand(filterpat=' ')
g = ReExpand::Generator.new
g.add(self,'')
g.add(self,"\#{$1}\t\#{$2}\t\#{$3}\t\#{$4}\t\#{$5}\t\#{$6}\t\#{$7}\t\#{$8}\t\#{$9}")
strings = []
#if filterpat.class == Regexp && block then
# g.generate(' ',block)
# return
if filterpat.class == String then
matched = g.generate(filterpat)
res = matched[0].length > 0 ? matched[0] : matched[1].length > 0 ? matched[1] : matched[2]
strings = res.collect { |r|
m = g.generate(filterpat)
matched = m[0].length > 0 ? m[0] : m[1].length > 0 ? m[1] : m[2]
strings = matched.collect { |r|
r[0]
}
else
matched = g.generate(' ')
strings = matched[0].collect { |r|
r[0]
}
matched = g.generate(' ')[0]
if filterpat.class == Regexp then
strings = strings.find_all { |s|
filterpat.match(s)
matched = matched.find_all { |r|
filterpat.match(r[0])
}
end
strings = matched.collect { |r|
r[0]
}
end

if block_given? then
strings.each { |string|
yield string
matched.collect { |m|
yield m[0], m[1].split(/\t/)
}
else
strings
Expand Down
Binary file modified pkg/re_expand-0.0.3.gem
View file
Binary file not shown.
4 changes: 0 additions & 4 deletions pkg/re_expand-0.0.3/lib/Generator.rb
View file
Expand Up @@ -114,10 +114,6 @@ def generate(pat, app = nil)
patstr = (["(.*)"] * sslen).join("\t")
/#{patstr}/ =~ ss.join("\t")
end
## next if $1 == $2
#File.open("/tmp/log","a"){ |f|
# f.puts "#{s}-----" + eval('%('+@commands[acceptno]+')')
#}
# 'set date #{$2}' のような記述の$変数にsubstringの値を代入
res[ambig] << [s, eval('%('+@commands[acceptno]+')')]
end
Expand Down
24 changes: 12 additions & 12 deletions pkg/re_expand-0.0.3/lib/re_expand.rb
View file
Expand Up @@ -15,32 +15,32 @@ class String
# ExpandHelp用のライブラリを利用
def expand(filterpat=' ')
g = ReExpand::Generator.new
g.add(self,'')
g.add(self,"\#{$1}\t\#{$2}\t\#{$3}\t\#{$4}\t\#{$5}\t\#{$6}\t\#{$7}\t\#{$8}\t\#{$9}")
strings = []
#if filterpat.class == Regexp && block then
# g.generate(' ',block)
# return
if filterpat.class == String then
matched = g.generate(filterpat)
res = matched[0].length > 0 ? matched[0] : matched[1].length > 0 ? matched[1] : matched[2]
strings = res.collect { |r|
m = g.generate(filterpat)
matched = m[0].length > 0 ? m[0] : m[1].length > 0 ? m[1] : m[2]
strings = matched.collect { |r|
r[0]
}
else
matched = g.generate(' ')
strings = matched[0].collect { |r|
r[0]
}
matched = g.generate(' ')[0]
if filterpat.class == Regexp then
strings = strings.find_all { |s|
filterpat.match(s)
matched = matched.find_all { |r|
filterpat.match(r[0])
}
end
strings = matched.collect { |r|
r[0]
}
end

if block_given? then
strings.each { |string|
yield string
matched.collect { |m|
yield m[0], m[1].split(/\t/)
}
else
strings
Expand Down

0 comments on commit fc0549f

Please sign in to comment.