diff options
Diffstat (limited to 'lib/erb.rb')
| -rw-r--r-- | lib/erb.rb | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/lib/erb.rb b/lib/erb.rb index ae2bfd0091..3ff64cbb3d 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -499,22 +499,9 @@ class ERB Scanner.default_scanner = TrimScanner - class SimpleScanner < Scanner # :nodoc: - def scan - @src.scan(/(.*?)(#{(stags + etags).join('|')}|\n|\z)/m) do |tokens| - tokens.each do |token| - next if token.empty? - yield(token) - end - end - end - end - - Scanner.regist_scanner(SimpleScanner, nil, false) - begin require 'strscan' - class SimpleScanner2 < Scanner # :nodoc: + class SimpleScanner < Scanner # :nodoc: def scan stag_reg = /(.*?)(#{stags.join('|')}|\z)/m etag_reg = /(.*?)(#{etags.join('|')}|\z)/m @@ -526,7 +513,10 @@ class ERB end end end - Scanner.regist_scanner(SimpleScanner2, nil, false) + Scanner.regist_scanner(SimpleScanner, nil, false) + + # Deprecated. Kept for backward compatibility. + SimpleScanner2 = SimpleScanner # :nodoc: class ExplicitScanner < Scanner # :nodoc: def scan |