diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/optparse.rb | 21 | ||||
| -rw-r--r-- | lib/optparse/date.rb | 17 | ||||
| -rw-r--r-- | lib/optparse/shellwords.rb | 2 | ||||
| -rw-r--r-- | lib/optparse/time.rb | 2 | ||||
| -rw-r--r-- | lib/optparse/uri.rb | 2 |
6 files changed, 34 insertions, 14 deletions
@@ -1,3 +1,7 @@ +Wed May 21 13:26:08 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> + + * lib/optparse.rb: get rid of warnings. + Tue May 20 18:59:54 2003 Yukihiro Matsumoto <matz@ruby-lang.org> * eval.c (rb_thread_save_context): prohibit rb_gc_force_recycle() diff --git a/lib/optparse.rb b/lib/optparse.rb index dfda6b2595..54a92ceff2 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -844,8 +844,7 @@ Default options, which never appear in option summary. --- OptionParser#to_s Returns option summary string. =end #'#"#`# - def to_str; summarize(banner.to_s.sub(/\n?\z/, "\n")) end - alias to_s to_str + def to_s; summarize(banner.to_s.sub(/\n?\z/, "\n")) end =begin --- OptionParser#to_a @@ -1325,9 +1324,9 @@ Default options, which never appear in option summary. : Object any string, and no conversion. this is fall-back. =end #'#"#`# - accept(Object) {|s|s or s.nil?} + accept(Object) {|s,|s or s.nil?} - accept(NilClass) {|s|s} + accept(NilClass) {|s,|s} =begin : String @@ -1346,7 +1345,7 @@ Default options, which never appear in option summary. hex = 'x[\da-f]+(?:_[\da-f]+)*' octal = "0(?:[0-7]*(?:_[0-7]+)*|#{binary}|#{hex})" integer = "#{octal}|#{decimal}" - accept(Integer, %r"\A[-+]?(?:#{integer})"io) {|s| Integer(s) if s} + accept(Integer, %r"\A[-+]?(?:#{integer})"io) {|s,| Integer(s) if s} =begin : Float @@ -1354,21 +1353,21 @@ Default options, which never appear in option summary. =end #'#"#`# float = "(?:#{decimal}(?:\\.(?:#{decimal})?)?|\\.#{decimal})(?:E[-+]?#{decimal})?" floatpat = %r"\A[-+]?#{float}"io - accept(Float, floatpat) {|s| s.to_f if s} + accept(Float, floatpat) {|s,| s.to_f if s} =begin : Numeric Generic numeric format, and converts to (({Integer})) for integer format, (({Float})) for float format. =end #'#"#`# - accept(Numeric, %r"\A[-+]?(?:#{octal}|#{float})"io) {|s| eval(s) if s} + accept(Numeric, %r"\A[-+]?(?:#{octal}|#{float})"io) {|s,| eval(s) if s} =begin : OptionParser::DecimalInteger Decimal integer format, to be converted to (({Integer})). =end #'#"#`# DecimalInteger = /\A[-+]?#{decimal}/io - accept(DecimalInteger) {|s| s.to_i if s} + accept(DecimalInteger) {|s,| s.to_i if s} =begin : OptionParser::OctalInteger @@ -1376,7 +1375,7 @@ Default options, which never appear in option summary. to (({Integer})). =end #'#"#`# OctalInteger = /\A[-+]?(?:[0-7]+(?:_[0-7]+)*|0(?:#{binary}|#{hex}))/io - accept(OctalInteger) {|s| s.oct if s} + accept(OctalInteger) {|s,| s.oct if s} =begin : OptionParser::DecimalNumeric @@ -1384,7 +1383,7 @@ Default options, which never appear in option summary. (({Integer})) for integer format, (({Float})) for float format. =end #'#"#`# DecimalNumeric = floatpat # decimal integer is allowed as float also. - accept(DecimalNumeric) {|s| eval(s) if s} + accept(DecimalNumeric) {|s,| eval(s) if s} =begin : TrueClass @@ -1405,7 +1404,7 @@ Default options, which never appear in option summary. : Array List of strings separated by "," =end #'#"#`# - accept(Array) do |s| + accept(Array) do |s,| if s s = s.split(',').collect {|s| s unless s.empty?} end diff --git a/lib/optparse/date.rb b/lib/optparse/date.rb new file mode 100644 index 0000000000..c9f072f290 --- /dev/null +++ b/lib/optparse/date.rb @@ -0,0 +1,17 @@ +require 'optparse' +require 'date' + +OptionParser.accept(DateTime) do |s,| + begin + DateTime.parse(s) if s + rescue ArgumentError + raise OptionParser::InvalidArgument, s + end +end +OptionParser.accept(Date) do |s,| + begin + DateTime.parse(s) if s + rescue ArgumentError + raise OptionParser::InvalidArgument, s + end +end diff --git a/lib/optparse/shellwords.rb b/lib/optparse/shellwords.rb index 75cb57b72b..0422d7c887 100644 --- a/lib/optparse/shellwords.rb +++ b/lib/optparse/shellwords.rb @@ -3,4 +3,4 @@ require 'shellwords' require 'optparse' -OptionParser.accept(Shellwords) {|s| Shellwords.shellwords(s)} +OptionParser.accept(Shellwords) {|s,| Shellwords.shellwords(s)} diff --git a/lib/optparse/time.rb b/lib/optparse/time.rb index 9f677a8d31..402cadcf16 100644 --- a/lib/optparse/time.rb +++ b/lib/optparse/time.rb @@ -1,7 +1,7 @@ require 'optparse' require 'time' -OptionParser.accept(Time) do |s| +OptionParser.accept(Time) do |s,| begin (Time.httpdate(s) rescue Time.parse(s)) if s rescue diff --git a/lib/optparse/uri.rb b/lib/optparse/uri.rb index 5bdcf57c96..024dc69eac 100644 --- a/lib/optparse/uri.rb +++ b/lib/optparse/uri.rb @@ -3,4 +3,4 @@ require 'optparse' require 'uri' -OptionParser.accept(URI) {|s| URI.parse(s) if s} +OptionParser.accept(URI) {|s,| URI.parse(s) if s} |