summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-08-07 05:05:04 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2000-08-07 05:05:04 +0000
commitc67251edb478509b4abd9910e0b499a116112a3c (patch)
tree81d59bfb40b0efc64b3acfc9cbe4dd7d3628af85 /lib
parent14fe04bdacfb1bbe1e568c4e1dd4092a64c5ede7 (diff)
matz
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/complex.rb12
-rw-r--r--lib/debug.rb4
-rw-r--r--lib/thread.rb6
3 files changed, 11 insertions, 11 deletions
diff --git a/lib/complex.rb b/lib/complex.rb
index 733e4530e3..cb0a3dc564 100644
--- a/lib/complex.rb
+++ b/lib/complex.rb
@@ -125,12 +125,12 @@ class Complex < Numeric
def / (other)
if other.kind_of?(Complex)
- self * other.conjugate / other.abs2
+ self*other.conjugate/other.abs2
elsif Complex.generic?(other)
- Complex(@real / other, @image / other)
+ Complex(@real/other, @image/other)
else
- x , y = other.coerce(self)
- x / y
+ x, y = other.coerce(self)
+ x/y
end
end
@@ -171,8 +171,8 @@ class Complex < Numeric
r, theta = polar
Complex.polar(r.power!(other), theta * other)
else
- x , y = other.coerce(self)
- x / y
+ x, y = other.coerce(self)
+ x/y
end
end
diff --git a/lib/debug.rb b/lib/debug.rb
index 71fe830475..f8c0e4e408 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -10,7 +10,7 @@ SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
require 'tracer'
class Tracer
def Tracer.trace_func(*vars)
- Single.trace_func *vars
+ Single.trace_func(*vars)
end
end
@@ -216,7 +216,7 @@ class DEBUGGER__
@frames[0] = [binding, file, line, id]
display_expressions(binding)
while input = readline("(rdb:%d) "%thnum(), true)
- catch (:debug_error) do
+ catch(:debug_error) do
if input == ""
input = DEBUG_LAST_CMD[0]
stdout.print input, "\n"
diff --git a/lib/thread.rb b/lib/thread.rb
index fd51d6d562..12fe81c542 100644
--- a/lib/thread.rb
+++ b/lib/thread.rb
@@ -21,13 +21,13 @@ if $DEBUG
end
def Thread.exclusive
+ _old = Thread.critical
begin
Thread.critical = true
- r = yield
+ return yield
ensure
- Thread.critical = false
+ Thread.critical = _old
end
- r
end
class Mutex