diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-23 17:43:45 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-23 17:43:45 +0000 |
| commit | 3435f0c106fac2dda1d4869c9faf9bccded5678f (patch) | |
| tree | 6fa3aba44035cbeb2f47191c1cb857c8547e9312 /lib | |
| parent | 214d80f89cbeceab187600cbe495defd4147614d (diff) | |
merge revision(s) 21432:
* lib/erb.rb (PercentScanner): remove PercentScanner. fixed % after
%> bug. [ruby-dev:37751] [Bug #997]
* test/erb/test_erb.rb: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/erb.rb | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/lib/erb.rb b/lib/erb.rb index d7c72b4988..d111e8f999 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -422,34 +422,6 @@ class ERB end Scanner.regist_scanner(SimpleScanner2, nil, false) - class PercentScanner < Scanner # :nodoc: - def scan - new_line = true - stag_reg = /(.*?)(<%%|<%=|<%#|<%|\n|\z)/ - etag_reg = /(.*?)(%%>|%>|\n|\z)/ - scanner = StringScanner.new(@src) - while ! scanner.eos? - if new_line && @stag.nil? - if scanner.scan(/%%/) - yield('%') - new_line = false - next - elsif scanner.scan(/%/) - yield(PercentLine.new(scanner.scan(/.*?(\n|\z)/).chomp)) - next - end - end - scanner.scan(@stag ? etag_reg : stag_reg) - text = scanner[1] - elem = scanner[2] - yield(text) unless text.empty? - yield(elem) unless elem.empty? - new_line = (elem == "\n") - end - end - end - Scanner.regist_scanner(PercentScanner, nil, true) - class ExplicitScanner < Scanner # :nodoc: def scan new_line = true |