From ec620c402573af9960920809c6b210fcbc9e9fba Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 30 May 2000 04:24:17 +0000
Subject: 2000-05-30

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/thread.rb  | 17 +++++++++++------
 lib/timeout.rb |  1 +
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/thread.rb b/lib/thread.rb
index a0e6967a2..fd51d6d56 100644
--- a/lib/thread.rb
+++ b/lib/thread.rb
@@ -162,9 +162,11 @@ class Queue
     end
     t.run if t
   end
-  alias enq push
+  def enq(obj)
+    push(obj)
+  end
 
-  def pop non_block=false
+  def pop(non_block=false)
     Thread.critical = true
     begin
       loop do
@@ -182,8 +184,10 @@ class Queue
       Thread.critical = false
     end
   end
-  alias shift pop
-  alias deq pop
+  def shift(non_block=false)
+    pop(non_block=false)
+  end
+  alias deq shift
 
   def empty?
     @que.length == 0
@@ -196,8 +200,9 @@ class Queue
   def length
     @que.length
   end
-  alias size length
-
+  def size
+    length
+  end
 
   def num_waiting
     @waiting.size
diff --git a/lib/timeout.rb b/lib/timeout.rb
index ba93a62f1..4e6f546e0 100644
--- a/lib/timeout.rb
+++ b/lib/timeout.rb
@@ -29,6 +29,7 @@ class TimeoutError<StandardError
 end
 
 def timeout(sec)
+  return yield if sec == nil
   begin
     x = Thread.current
     y = Thread.start {
-- 
cgit