* lib/optparse.rb (OptionParser::Switch::parse,

  OptionParser::order): use {Block,Proc}#call instead of deprecated
  #yield.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3868 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 24a3a17c8..edb11d707 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon May 26 21:21:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/optparse.rb (OptionParser::Switch::parse,
+	  OptionParser::order): use {Block,Proc}#call instead of deprecated
+	  #yield.
+
 Mon May 26 16:39:10 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (Init_Proc): Block/Proc separation. [huge change]
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 54a92ceff..cdc8ce446 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -222,7 +222,7 @@ Individual switch class.
 =end #'#"#`#
     def parse(arg, *val)
       if block
-	val = conv.yield(*val) if conv
+	val = conv.call(*val) if conv
 	return arg, block, val
       else
 	return arg, nil
@@ -1117,7 +1117,7 @@ Default options, which never appear in option summary.
 	  end
 	  begin
 	    opt, sw, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
-	    sw.yield(val) if sw
+	    sw.call(val) if sw
 	  rescue ParseError
 	    raise $!.set_option(arg, rest)
 	  end
@@ -1146,7 +1146,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.call(val) if sw
 	  rescue ParseError
 	    raise $!.set_option(arg, has_arg)
 	  end