summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-03-20 09:31:41 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-03-20 09:31:41 +0000
commit3566e8c24ae180a1ff02ae13f2b02fffc4f55197 (patch)
tree003ce3e8c53df2e35930d7ed0868d5476f3c4813
parentf0f8585106c7d933fbd06300aea9c31834787613 (diff)
downloadruby-3566e8c24ae180a1ff02ae13f2b02fffc4f55197.tar.gz
ruby-3566e8c24ae180a1ff02ae13f2b02fffc4f55197.tar.xz
ruby-3566e8c24ae180a1ff02ae13f2b02fffc4f55197.zip
* lib/optparse.rb (OptionParser#order!): follow recent change
of proc argument. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/optparse.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3756b47df..8ca30b6f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 20 18:31:37 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
+
+ * lib/optparse.rb (OptionParser#order!): follow recent change
+ of proc argument.
+
Thu Mar 20 16:12:53 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* numeric.c (flo_to_s): change format specifier to "%.15g" to
diff --git a/lib/optparse.rb b/lib/optparse.rb
index d7434ca4f..559707abb 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1147,7 +1147,7 @@ Default options, which never appear in option summary.
opt, sw, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}"
argv.unshift(opt) if opt and (opt = opt.sub(/\A-*/, '-')) != '-'
- sw.yield(val) if sw
+ sw.yield(*val) if sw
rescue ParseError
raise $!.set_option(arg, has_arg)
end