1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

erb.rb: Prevent potential unexpected rescue

Browse Source 
of LoadError in some method calls, not from `require "strscan"`.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2017-05-20 16:20:07 +00:00
parent 9aa33d5ddf
commit a6986f10d0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/erb.rb
View File

@ -501,6 +501,8 @@ class ERB
begin begin
require 'strscan' require 'strscan'
rescue LoadError
else
class SimpleScanner < Scanner # :nodoc: class SimpleScanner < Scanner # :nodoc:
def scan def scan
stag_reg = /(.*?)(#{stags.join('|')}|\z)/m stag_reg = /(.*?)(#{stags.join('|')}|\z)/m
@ -540,8 +542,6 @@ class ERB
end end
end end
Scanner.regist_scanner(ExplicitScanner, '-', false) Scanner.regist_scanner(ExplicitScanner, '-', false)
rescue LoadError
end end
class Buffer # :nodoc: class Buffer # :nodoc: