From 1178a6fdba491548089c1765c2099bd9ce538bcc Mon Sep 17 00:00:00 2001 From: hsbt Date: Tue, 15 Dec 2015 03:20:36 +0000 Subject: * lib/erb.rb: Simplify regexp to optimize erb scanner. [fix GH-1144] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/erb.rb | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5264327830..e50863addf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 15 12:20:30 2015 Takashi Kokubun + + * lib/erb.rb: Simplify regexp to optimize erb scanner. + [fix GH-1144] + Tue Dec 15 11:56:24 2015 SHIBATA Hiroshi * 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) -- cgit v1.2.3