summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-02-17 15:40:32 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-02-17 15:40:32 +0000
commit3442be4e84eaebcd718c1ba5b89818830653dcb5 (patch)
tree730aaf8e48c3ad164793e16f0b98fb1fb8d63d03 /lib
parentccf99b9ce600ceb1f0360db7af4164a916f03882 (diff)
* lib/tracer.rb: merged a minor clarification patch from Daniel
Berger <Daniel.Berger at qwest.com>. [ruby-core:07376] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/tracer.rb22
1 files changed, 9 insertions, 13 deletions
diff --git a/lib/tracer.rb b/lib/tracer.rb
index c3f2fb8f2e..893a9d5827 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -24,8 +24,6 @@ class Tracer
attr :stdout, true
end
- MY_FILE_NAME = caller(0)[0].scan(/^(.*):[0-9]+$/)[0][0]
-
EVENT_SYMBOL = {
"line" => "-",
"call" => ">",
@@ -114,7 +112,7 @@ class Tracer
end
def trace_func(event, file, line, id, binding, klass, *)
- return if file == MY_FILE_NAME
+ return if file == __FILE__
for p in @filters
return unless p.call event, file, line, id, binding, klass
@@ -157,15 +155,13 @@ end
SCRIPT_LINES__ = {} unless defined? SCRIPT_LINES__
-if caller(0).size == 1
- if $0 == Tracer::MY_FILE_NAME
- # direct call
+if $0 == __FILE__
+ # direct call
- $0 = ARGV[0]
- ARGV.shift
- Tracer.on
- require $0
- else
- Tracer.on
- end
+ $0 = ARGV[0]
+ ARGV.shift
+ Tracer.on
+ require $0
+else
+ Tracer.on
end