diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-10 08:21:07 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-03-10 08:21:07 +0000 |
| commit | b88714dc096f539d09092124fe089d0a52bf5133 (patch) | |
| tree | 0d2a03b24ab9e397b3168909702b0121a287147b /lib | |
| parent | b7ec4cf720c236d2d5d129ddf96edd062116819f (diff) | |
| download | ruby-b88714dc096f539d09092124fe089d0a52bf5133.tar.gz ruby-b88714dc096f539d09092124fe089d0a52bf5133.tar.xz ruby-b88714dc096f539d09092124fe089d0a52bf5133.zip | |
* eval.c (return_jump): set return value to the return
destination. separated from localjump_destination().
* eval.c (break_jump): break innermost loop (or thread or proc).
* eval.c (rb_yield_0): set exit_value for block break.
* eval.c (eval): Only print backtrace if generating the backtrace
doesn't generate an exception. [ruby-core:02621]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@5936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/irb/completion.rb | 2 | ||||
| -rw-r--r-- | lib/irb/init.rb | 3 | ||||
| -rw-r--r-- | lib/irb/lc/help-message | 1 | ||||
| -rw-r--r-- | lib/irb/lc/ja/help-message | 1 |
4 files changed, 6 insertions, 1 deletions
diff --git a/lib/irb/completion.rb b/lib/irb/completion.rb index 46e6f24f3..e51a92adc 100644 --- a/lib/irb/completion.rb +++ b/lib/irb/completion.rb @@ -182,7 +182,7 @@ module IRB end if Readline.respond_to?("basic_word_break_characters=") - Readline.basic_word_break_characters= "\t\n\"\\'`><=;|&{(" + Readline.basic_word_break_characters= " \t\n\"\\'`><=;|&{(" end Readline.completion_append_character = nil Readline.completion_proc = IRB::InputCompletor::CompletionProc diff --git a/lib/irb/init.rb b/lib/irb/init.rb index 9fd86e94a..37cdb313e 100644 --- a/lib/irb/init.rb +++ b/lib/irb/init.rb @@ -126,6 +126,9 @@ module IRB when "-r" opt = ARGV.shift @CONF[:LOAD_MODULES].push opt if opt + when "-I" + opt = ARGV.shift + $LOAD_PATH.push opt if opt when /^-K(.)/ $KCODE = $1 when "--inspect" diff --git a/lib/irb/lc/help-message b/lib/irb/lc/help-message index 42e861a34..efc00bf14 100644 --- a/lib/irb/lc/help-message +++ b/lib/irb/lc/help-message @@ -14,6 +14,7 @@ Usage: irb.rb [options] [programfile] [arguments] -m Bc mode (load mathn, fraction or matrix are available) -d Set $DEBUG to true (same as `ruby -d') -r load-module Same as `ruby -r' + -I path Specify $LOAD_PATH directory --inspect Use `inspect' for output (default except for bc mode) --noinspect Don't use inspect for output --readline Use Readline extension module diff --git a/lib/irb/lc/ja/help-message b/lib/irb/lc/ja/help-message index 1cf980f6b..4b710c778 100644 --- a/lib/irb/lc/ja/help-message +++ b/lib/irb/lc/ja/help-message @@ -14,6 +14,7 @@ Usage: irb.rb [options] [programfile] [arguments] -m bc$B%b!<%I(B($BJ,?t(B, $B9TNs$N7W;;$,$G$-$k(B) -d $DEBUG $B$r(Btrue$B$K$9$k(B(ruby -d $B$HF1$8(B) -r load-module ruby -r $B$HF1$8(B. + -I path $LOAD_PATH $B$K(B path $B$rDI2C$9$k(B. --inspect $B7k2L=PNO$K(Binspect$B$rMQ$$$k(B(bc$B%b!<%I0J30$O%G%U%)%k%H(B). --noinspect $B7k2L=PNO$K(Binspect$B$rMQ$$$J$$(B. --readline readline$B%i%$%V%i%j$rMxMQ$9$k(B. |