diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 13:32:42 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-12 13:32:42 +0000 |
commit | fdbfb35c42385bc9a55657dca747da9c10be2327 (patch) | |
tree | bca5b83f3c0f35cd391ce50720f8f31839881d4b /lib | |
parent | 9aa12f778f0b8dd1a9cc0f109496c495a5dad189 (diff) |
merges r21431 from trunk into ruby_1_9_1.
remove PercentScanner. fixed % after %> bug. [ruby-dev:37751] [Bug #997]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/erb.rb | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/lib/erb.rb b/lib/erb.rb index 65a10f0d68..678f082b07 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -444,40 +444,6 @@ class ERB end Scanner.regist_scanner(SimpleScanner2, nil, false) - class PercentScanner < Scanner # :nodoc: - def scan(&blk) - stag_reg = /(.*?)(^%%|^%|<%%|<%=|<%#|<%|\z)/m - etag_reg = /(.*?)(%%>|%>|\z)/m - scanner = StringScanner.new(@src) - while ! scanner.eos? - scanner.scan(@stag ? etag_reg : stag_reg) - yield(scanner[1]) - - elem = scanner[2] - if elem == '%%' - yield('%') - inline_scan(scanner.scan(/.*?(\n|\z)/), &blk) - elsif elem == '%' - yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp)) - else - yield(elem) - end - end - end - - def inline_scan(line) - stag_reg = /(.*?)(<%%|<%=|<%#|<%|\z)/m - etag_reg = /(.*?)(%%>|%>|\z)/m - scanner = StringScanner.new(line) - while ! scanner.eos? - scanner.scan(@stag ? etag_reg : stag_reg) - yield(scanner[1]) - yield(scanner[2]) - end - end - end - Scanner.regist_scanner(PercentScanner, nil, true) - class ExplicitScanner < Scanner # :nodoc: def scan stag_reg = /(.*?)(^[ \t]*<%-|<%%|<%=|<%#|<%-|<%|\z)/m |