diff options
| author | seki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-11 11:21:26 +0000 |
|---|---|---|
| committer | seki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-11 11:21:26 +0000 |
| commit | 3094ebf3d1137ac3be35c9f2ffbdff9c5dba651d (patch) | |
| tree | 33afc0b91218d164bb08f89e5e5db19ec06a01d7 /lib | |
| parent | 42d4569018520bd800c4438e798705de444e0f27 (diff) | |
remove PercentScanner. fixed % after %> bug. [ruby-dev:37751] [Bug #997]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@21432 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 1f6e9781c3..f486d810e5 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -426,40 +426,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 |
