diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/erb.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue Dec 15 12:20:30 2015 Takashi Kokubun <takashikkbn@gmail.com> + + * lib/erb.rb: Simplify regexp to optimize erb scanner. + [fix GH-1144] + Tue Dec 15 11:56:24 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> * lib/uri/common.rb: make code block for rdoc. diff --git a/lib/erb.rb b/lib/erb.rb index 25654d62c5..b099c82ff7 100644 --- a/lib/erb.rb +++ b/lib/erb.rb @@ -506,8 +506,8 @@ class ERB require 'strscan' class SimpleScanner2 < Scanner # :nodoc: def scan - stag_reg = /(.*?)(<%%|<%=|<%#|<%|\z)/m - etag_reg = /(.*?)(%%>|%>|\z)/m + stag_reg = /(.*?)(<%[%=#]?|\z)/m + etag_reg = /(.*?)(%%?>|\z)/m scanner = StringScanner.new(@src) while ! scanner.eos? scanner.scan(@stag ? etag_reg : stag_reg) |