Skip to content

Commit ae7de68

Browse files
committed
erb: multiline anchors
* bin/erb (ARGV.switch, ERB::Main#run): use beginning/end of string anchors instead of beginning/end of line anchors. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 99eeaca commit ae7de68

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

bin/erb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ class ERB
1111
return nil if self.empty?
1212
arg = self.shift
1313
return nil if arg == '--'
14-
if arg =~ /^-(.)(.*)/
14+
case arg
15+
when /\A-(.)(.*)/
1516
if $1 == '-'
1617
arg, @maybe_arg = arg.split(/=/, 2)
1718
return arg
@@ -72,15 +73,15 @@ class ERB
7273
require ARGV.req_arg
7374
when '-S' # security level
7475
arg = ARGV.req_arg
75-
raise "invalid safe_level #{arg.dump}" unless arg =~ /^[0-3]$/
76+
raise "invalid safe_level #{arg.dump}" unless arg =~ /\A[0-3]\z/
7677
safe_level = arg.to_i
7778
when '-T' # trim mode
7879
arg = ARGV.req_arg
7980
if arg == '-'
8081
trim_mode = arg
8182
next
8283
end
83-
raise "invalid trim mode #{arg.dump}" unless arg =~ /^[0-2]$/
84+
raise "invalid trim mode #{arg.dump}" unless arg =~ /\A[0-2]\z/
8485
trim_mode = arg.to_i
8586
when '-E', '--encoding'
8687
arg = ARGV.req_arg

0 commit comments

Comments
 (0)