diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-10 01:20:24 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-10 01:20:24 +0000 |
| commit | bcdcc6099a682f5a558d493a5a91c48c694070f0 (patch) | |
| tree | e35b79c392e64df3d524054b0db4be39bf04dbbd /lib/irb | |
| parent | 68043e4379705b4e6f9a93bcba046ece61bfc73a (diff) | |
| download | ruby-bcdcc6099a682f5a558d493a5a91c48c694070f0.tar.gz ruby-bcdcc6099a682f5a558d493a5a91c48c694070f0.tar.xz ruby-bcdcc6099a682f5a558d493a5a91c48c694070f0.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@10239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/irb')
| -rw-r--r-- | lib/irb/slex.rb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/irb/slex.rb b/lib/irb/slex.rb index 866bf30a5..64321eb45 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 |