seki	2008-03-24 01:27:20 +0900 (Mon, 24 Mar 2008)

  New Revision: 15829

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/erb.rb

  Log:
    use proc instead of Thread. [ruby-dev:33692]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15829&r2=15828&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/erb.rb?r1=15829&r2=15828&diff_format=u

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 15828)
+++ ruby_1_8/ChangeLog	(revision 15829)
@@ -1,3 +1,7 @@
+Mon Mar 24 01:24:24 2008  Masatoshi SEKI  <m_seki@m...>
+
+	* lib/erb.rb (result): use proc instead of Thread. [ruby-dev:33692]
+
 Fri Mar 21 21:26:52 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin.
Index: ruby_1_8/lib/erb.rb
===================================================================
--- ruby_1_8/lib/erb.rb	(revision 15828)
+++ ruby_1_8/lib/erb.rb	(revision 15829)
@@ -729,13 +729,12 @@
   #
   def result(b=TOPLEVEL_BINDING)
     if @safe_level
-      th = Thread.start { 
+      proc { 
 	$SAFE = @safe_level
 	eval(@src, b, (@filename || '(erb)'), 1)
-      }
-      return th.value
+      }.call
     else
-      return eval(@src, b, (@filename || '(erb)'), 1)
+      eval(@src, b, (@filename || '(erb)'), 1)
     end
   end
 

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