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

* lib/optparse.rb (default_argv, Arguable#options): defaults strings

Browse Source 
to be parsed to Arguable instance.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9258 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-09-20 22:45:06 +00:00
parent 66e67afd45
commit 898c734378
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Sep 21 07:43:58 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (default_argv, Arguable#options): defaults strings
to be parsed to Arguable instance.
Tue Sep 20 22:25:43 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Sep 20 22:25:43 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/io/wait/lib/nonblock.rb: disable on platforms non-blocking flag * ext/io/wait/lib/nonblock.rb: disable on platforms non-blocking flag

12
lib/optparse.rb
View File

@ -840,6 +840,7 @@ class OptionParser
@banner = banner @banner = banner
@summary_width = width @summary_width = width
@summary_indent = indent @summary_indent = indent
@default_argv = ARGV
add_officious add_officious
yield self if block_given? yield self if block_given?
end end
@ -915,9 +916,13 @@ class OptionParser
--- OptionParser#program_name=(name) --- OptionParser#program_name=(name)
Program name to be emitted in error message and default banner, Program name to be emitted in error message and default banner,
defaulted to (({$0})). defaulted to (({$0})).
--- OptionParser#default_argv
--- OptionParser#default_argv=(argv)
Strings to be parsed in default.
=end #'#"#`# =end #'#"#`#
attr_writer :banner, :program_name attr_writer :banner, :program_name
attr_accessor :summary_width, :summary_indent attr_accessor :summary_width, :summary_indent
attr_accessor :default_argv
def banner def banner
unless @banner unless @banner
@ -1298,7 +1303,7 @@ class OptionParser
order!(argv, &block) order!(argv, &block)
end end
def order!(argv = ARGV, &nonopt) def order!(argv = default_argv, &nonopt)
opt, arg, sw, val, rest = nil opt, arg, sw, val, rest = nil
nonopt ||= proc {|arg| throw :terminate, arg} nonopt ||= proc {|arg| throw :terminate, arg}
argv.unshift(arg) if arg = catch(:terminate) { argv.unshift(arg) if arg = catch(:terminate) {
@ -1385,7 +1390,7 @@ class OptionParser
permute!(argv) permute!(argv)
end end
def permute!(argv = ARGV) def permute!(argv = default_argv)
nonopts = [] nonopts = []
arg = nil arg = nil
order!(argv) {|arg| nonopts << arg} order!(argv) {|arg| nonopts << arg}
@ -1411,7 +1416,7 @@ class OptionParser
parse!(argv) parse!(argv)
end end
def parse!(argv = ARGV) def parse!(argv = default_argv)
if ENV.include?('POSIXLY_CORRECT') if ENV.include?('POSIXLY_CORRECT')
order!(argv) order!(argv)
else else
@ -1803,6 +1808,7 @@ Extends command line arguments array to parse itself.
=end #'#"#`# =end #'#"#`#
def options def options
@optparse ||= OptionParser.new @optparse ||= OptionParser.new
@optparse.default_argv = self
block_given? or return @optparse block_given? or return @optparse
begin begin
yield @optparse yield @optparse