yugui	2009-07-27 00:33:29 +0900 (Mon, 27 Jul 2009)

  New Revision: 24294

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24294

  Log:
    merges r24229 and r24233 from trunk into ruby_1_9_1.
    --
     * 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]
    --
     * lib/irb.rb: forget svn commit.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/irb/ext/save-history.rb
    branches/ruby_1_9_1/lib/irb/init.rb
    branches/ruby_1_9_1/lib/irb.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24293)
+++ ruby_1_9_1/ChangeLog	(revision 24294)
@@ -1,3 +1,12 @@
+Wed Jul 22 02:33:57 2009  Keiju Ishitsuka  <keiju@e...>
+
+	* lib/irb.rb: forget svn commit.
+
+Wed Jul 22 00:34:39 2009  Keiju Ishitsuka  <keiju@r...>
+
+	* 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 20:41:20 2009  Keiju Ishitsuka  <keiju@e...>
 
 	* lib/tracer.rb: no show lines unkonwn line number. [ruby-core:22096],
Index: ruby_1_9_1/lib/irb/ext/save-history.rb
===================================================================
--- ruby_1_9_1/lib/irb/ext/save-history.rb	(revision 24293)
+++ ruby_1_9_1/lib/irb/ext/save-history.rb	(revision 24294)
@@ -49,23 +49,24 @@
   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
@@ -81,6 +82,19 @@
 	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
 
Index: ruby_1_9_1/lib/irb/init.rb
===================================================================
--- ruby_1_9_1/lib/irb/init.rb	(revision 24293)
+++ ruby_1_9_1/lib/irb/init.rb	(revision 24294)
@@ -113,6 +113,8 @@
 #    @CONF[:LC_MESSAGES] = "en"
     @CONF[:LC_MESSAGES] = Locale.new
     
+    @CONF[:AT_EXIT] = []
+    
     @CONF[:DEBUG_LEVEL] = 1
   end
 
Index: ruby_1_9_1/lib/irb.rb
===================================================================
--- ruby_1_9_1/lib/irb.rb	(revision 24293)
+++ ruby_1_9_1/lib/irb.rb	(revision 24294)
@@ -64,13 +64,21 @@
     trap("SIGINT") do
       irb.signal_handle
     end
-    
-    catch(:IRB_EXIT) do
-      irb.eval_input
+
+    begin
+      catch(:IRB_EXIT) do
+	irb.eval_input
+      end
+    ensure
+      irb_at_exit
     end
 #    print "\n"
   end
 
+  def IRB.irb_at_exit
+    @CONF[:AT_EXIT].each{|hook| hook.call}
+  end
+
   def IRB.irb_exit(irb, ret)
     throw :IRB_EXIT, ret
   end
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24293)
+++ ruby_1_9_1/version.h	(revision 24294)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 251
+#define RUBY_PATCHLEVEL 252
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/