From ce7c263fb621099b1aaed1018e56fd7dd7dee258 Mon Sep 17 00:00:00 2001 From: keiju Date: Thu, 14 Apr 2005 09:58:18 +0000 Subject: * lib/irb/ruby-lex.rb, lib/irb/slex.rb: bug fix of [ruby-Bugs-1745] * lib/irb/ext/loader.rb, lib/irb/ext/save-history.rb: fix location of @RCS_ID * lib/irb/cmd/help.rb: a lost of release IRB 0.9.5. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++++ lib/irb/cmd/help.rb | 11 +++++++++++ lib/irb/ext/loader.rb | 3 +-- lib/irb/ext/save-history.rb | 6 ++++-- lib/irb/ruby-lex.rb | 5 +++-- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a19619cc26..656518facd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Thu Apr 14 18:51:02 2005 Keiju Ishitsuka + + * lib/irb/ruby-lex.rb, lib/irb/slex.rb: bug fix of [ruby-Bugs-1745] + + * lib/irb/ext/loader.rb, lib/irb/ext/save-history.rb: + fix location of @RCS_ID + + * lib/irb/cmd/help.rb: a lost of release IRB 0.9.5. + Thu Apr 14 15:10:30 2005 Keiju Ishitsuka * lib/irb/notifier.rb, lib/irb/output-method.rb, lib/irb/ext/history.rb diff --git a/lib/irb/cmd/help.rb b/lib/irb/cmd/help.rb index 73067f53c6..3e8d1388e0 100644 --- a/lib/irb/cmd/help.rb +++ b/lib/irb/cmd/help.rb @@ -1,3 +1,14 @@ +# +# help.rb - helper using ri +# $Release Version: 0.9.5$ +# $Revision$ +# $Date$ +# +# -- +# +# +# + require 'rdoc/ri/ri_driver' module IRB diff --git a/lib/irb/ext/loader.rb b/lib/irb/ext/loader.rb index ac8cc6d745..837e2553ac 100644 --- a/lib/irb/ext/loader.rb +++ b/lib/irb/ext/loader.rb @@ -10,14 +10,13 @@ # # -@RCS_ID='-$Id$-' - module IRB class LoadAbort < Exception;end module IrbLoader @RCS_ID='-$Id$-' + alias ruby_load load alias ruby_require require diff --git a/lib/irb/ext/save-history.rb b/lib/irb/ext/save-history.rb index 95ef71b5c1..5260bfcdd8 100644 --- a/lib/irb/ext/save-history.rb +++ b/lib/irb/ext/save-history.rb @@ -11,11 +11,13 @@ # # -@RCS_ID='-$Id$-' - require "readline" module IRB + module HistorySavingAbility + @RCS_ID='-$Id$-' + end + class Context def init_save_history unless (class<<@io;self;end).include?(HistorySavingAbility) diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb index 9e055ee94a..4c51afbc28 100644 --- a/lib/irb/ruby-lex.rb +++ b/lib/irb/ruby-lex.rb @@ -100,7 +100,8 @@ class RubyLex def getc while @rests.empty? - return nil unless buf_input +# return nil unless buf_input + @rests.push nil unless buf_input end c = @rests.shift if @here_header @@ -121,7 +122,7 @@ class RubyLex def gets l = "" while c = getc - l.concat c + l.concat(c) break if c == "\n" end return nil if l == "" and c.nil? -- cgit v1.2.3