Skip to content

Consume attached erb option arguments once #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OskarEichler wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −2
Open

Consume attached erb option arguments once #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions libexec/erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@ class ERB
when /\A-(.)(.*)/
if $1 == '-'
arg, @maybe_arg = arg.split(/=/, 2)
@maybe_arg_from_short = false
return arg
end
raise 'unknown switch "-"' if $2[0] == ?- and $1 != 'T'
if $2.size > 0
self.unshift "-#{$2}"
@maybe_arg = $2
@maybe_arg_from_short = true
else
@maybe_arg = nil
@maybe_arg_from_short = false
end
"-#{$1}"
when /\A(\w+)=/
Expand All @@ -34,9 +37,17 @@ class ERB
end

def ARGV.req_arg
(@maybe_arg || self.shift || raise('missing argument')).tap {
begin
if @maybe_arg
self.shift if @maybe_arg_from_short
@maybe_arg
else
self.shift || raise('missing argument')
end
ensure
@maybe_arg = nil
}
@maybe_arg_from_short = false
end
end

def trim_mode_opt(trim_mode, disable_percent)
Expand Down