From 8686ee186197b3aeea3cfbe53014e36fb5ce9eac Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 10 Jun 2006 01:20:24 +0000
Subject: * lib/getoptlong.rb (GetoptLong#set_options): recieve arguments   as
 Array.

* lib/irb/slex.rb: use Proc#yield.

* lib/rdoc/markup/simple_markup/inline.rb: follow the new behavior
  of String#[].

* lib/rdoc/ri/ri_write.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/irb/slex.rb | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'lib/irb')

diff --git a/lib/irb/slex.rb b/lib/irb/slex.rb
index 866bf30a5c..64321eb456 100644
--- a/lib/irb/slex.rb
+++ b/lib/irb/slex.rb
@@ -167,9 +167,9 @@ module IRB
       def match(chrs, op = "")
 	D_DETAIL.print "match>: ", chrs, "op:", op, "\n"
 	if chrs.empty?
-	  if @preproc.nil? || @preproc.call(op, chrs)
+	  if @preproc.nil? || @preproc.yield(op, chrs)
 	    DOUT.printf(D_DETAIL, "op1: %s\n", op)
-	    @postproc.call(op, chrs)
+	    @postproc.yield(op, chrs)
 	  else
 	    nil
 	  end
@@ -180,9 +180,9 @@ module IRB
 	      return ret
 	    else
 	      chrs.unshift ch
-	      if @postproc and @preproc.nil? || @preproc.call(op, chrs)
+	      if @postproc and @preproc.nil? || @preproc.yield(op, chrs)
 		DOUT.printf(D_DETAIL, "op2: %s\n", op.inspect)
-		ret = @postproc.call(op, chrs)
+		ret = @postproc.yield(op, chrs)
 		return ret
 	      else
 		return nil
@@ -190,9 +190,9 @@ module IRB
 	    end
 	  else
 	    chrs.unshift ch
-	    if @postproc and @preproc.nil? || @preproc.call(op, chrs)
+	    if @postproc and @preproc.nil? || @preproc.yield(op, chrs)
 	      DOUT.printf(D_DETAIL, "op3: %s\n", op)
-	      @postproc.call(op, chrs)
+	      @postproc.yield(op, chrs)
 	      return ""
 	    else
 	      return nil
@@ -211,9 +211,9 @@ module IRB
 	  ch = io.getc_of_rests
 	end
 	if ch.nil?
-	  if @preproc.nil? || @preproc.call(op, io)
+	  if @preproc.nil? || @preproc.yield(op, io)
 	    D_DETAIL.printf("op1: %s\n", op)
-	    @postproc.call(op, io)
+	    @postproc.yield(op, io)
 	  else
 	    nil
 	  end
@@ -223,18 +223,18 @@ module IRB
 	      ret
 	    else
 	      io.ungetc ch
-	      if @postproc and @preproc.nil? || @preproc.call(op, io)
+	      if @postproc and @preproc.nil? || @preproc.yield(op, io)
 		DOUT.exec_if{D_DETAIL.printf "op2: %s\n", op.inspect}
-		@postproc.call(op, io)
+		@postproc.yield(op, io)
 	      else
 		nil
 	      end
 	    end
 	  else
 	    io.ungetc ch
-	    if @postproc and @preproc.nil? || @preproc.call(op, io)
+	    if @postproc and @preproc.nil? || @preproc.yield(op, io)
 	      D_DETAIL.printf("op3: %s\n", op)
-	      @postproc.call(op, io)
+	      @postproc.yield(op, io)
 	    else
 	      nil
 	    end
-- 
cgit v1.2.3