summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--lib/irb/ext/save-history.rb44
-rw-r--r--lib/irb/init.rb4
3 files changed, 40 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 76bedc3a64..9543675070 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 22 00:34:39 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
+
+ * lib/irb.rb, lib/irb/init.rb, lib/irb/ext/save-history.rb: add
+ IRB::irb_at_exit. no use finalizer saving history. [ruby-dev-38563]
+
Tue Jul 21 23:47:38 2009 Yusuke Endoh <mame@tsg.ne.jp>
* random.c (rand_init): array length of random seed was broken, which
@@ -5,11 +10,11 @@ Tue Jul 21 23:47:38 2009 Yusuke Endoh <mame@tsg.ne.jp>
* test/ruby/test_rand.c: test for above.
-Tue Jul 21 21:37:19 2009 Keiju Ishitsuka <keiju@emperor2.pendome>
+Tue Jul 21 21:37:19 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
* lib/irb/cmd/help.rb: fixed irb's "help" command. [ruby-core:22310].
-Tue Jul 21 20:41:20 2009 Keiju Ishitsuka <keiju@emperor2.pendome>
+Tue Jul 21 20:41:20 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
* lib/tracer.rb: no show lines unkonwn line number. [ruby-core:22096],
no trace display c-call and c-return as default.
@@ -618,7 +623,7 @@ Wed Jul 8 23:13:54 2009 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c (nucomp_div): omitted zero division check.
-Wed Jul 8 21:00:37 2009 Keiju Ishitsuka <keiju@emperor2.pendome>
+Wed Jul 8 21:00:37 2009 Keiju Ishitsuka <keiju@ruby-lang.org>
* lib/irb/inspector.rb: forget svn add.
diff --git a/lib/irb/ext/save-history.rb b/lib/irb/ext/save-history.rb
index e3597c6216..f9c983ac11 100644
--- a/lib/irb/ext/save-history.rb
+++ b/lib/irb/ext/save-history.rb
@@ -47,23 +47,24 @@ module IRB
module HistorySavingAbility
include Readline
- def HistorySavingAbility.create_finalizer
- proc do
- if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
- if history_file = IRB.conf[:HISTORY_FILE]
- history_file = File.expand_path(history_file)
- end
- history_file = IRB.rc_file("_history") unless history_file
- open(history_file, 'w' ) do |f|
- hist = HISTORY.to_a
- f.puts(hist[-num..-1] || hist)
- end
- end
- end
- end
+# def HistorySavingAbility.create_finalizer
+# proc do
+# if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
+# if hf = IRB.conf[:HISTORY_FILE]
+# file = File.expand_path(hf)
+# end
+# file = IRB.rc_file("_history") unless file
+# open(file, 'w' ) do |f|
+# hist = HISTORY.to_a
+# f.puts(hist[-num..-1] || hist)
+# end
+# end
+# end
+# end
def HistorySavingAbility.extended(obj)
- ObjectSpace.define_finalizer(obj, HistorySavingAbility.create_finalizer)
+# ObjectSpace.define_finalizer(obj, HistorySavingAbility.create_finalizer)
+ IRB.conf[:AT_EXIT].push proc{obj.save_history}
obj.load_history
obj
end
@@ -79,5 +80,18 @@ module IRB
end
end
end
+
+ def save_history
+ if num = IRB.conf[:SAVE_HISTORY] and (num = num.to_i) > 0
+ if history_file = IRB.conf[:HISTORY_FILE]
+ history_file = File.expand_path(history_file)
+ end
+ history_file = IRB.rc_file("_history") unless history_file
+ open(history_file, 'w' ) do |f|
+ hist = HISTORY.to_a
+ f.puts(hist[-num..-1] || hist)
+ end
+ end
+ end
end
end
diff --git a/lib/irb/init.rb b/lib/irb/init.rb
index 489850a86b..f51fd1c0b1 100644
--- a/lib/irb/init.rb
+++ b/lib/irb/init.rb
@@ -112,7 +112,9 @@ module IRB
# @CONF[:LC_MESSAGES] = "en"
@CONF[:LC_MESSAGES] = Locale.new
-
+
+ @CONF[:AT_EXIT] = []
+
@CONF[:DEBUG_LEVEL] = 1
end