summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-02-18 15:38:56 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-02-18 15:38:56 +0000
commita5d45b26393937d88fc2108e156dc0bd9b5433d8 (patch)
tree3c18f2f2d28784fd58e0324a1092ddb568863d46
parent719f5c99a2556ab8df968a37438eacde3be328f1 (diff)
downloadruby-a5d45b26393937d88fc2108e156dc0bd9b5433d8.tar.gz
ruby-a5d45b26393937d88fc2108e156dc0bd9b5433d8.tar.xz
ruby-a5d45b26393937d88fc2108e156dc0bd9b5433d8.zip
* lib/tracer.rb (Tracer::Tracer.add_filter): turn on tracer mode
only when caller() level size is one. [ruby-core:07389] * lib/rdoc/parsers/parse_rb.rb: need not to require "tracer". [ruby-core:07389] * sample/rtags.rb: ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog10
-rw-r--r--lib/rdoc/parsers/parse_rb.rb1
-rw-r--r--lib/tracer.rb2
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 81ee2f6b5..c056ad1ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sat Feb 18 23:58:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/tracer.rb (Tracer::Tracer.add_filter): turn on tracer mode
+ only when caller() level size is one. [ruby-core:07389]
+
+ * lib/rdoc/parsers/parse_rb.rb: need not to require "tracer".
+ [ruby-core:07389]
+
+ * sample/rtags.rb: ditto.
+
Sat Feb 18 21:16:27 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_obj_instance_eval): RDoc description updated. a
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index 17b87dcd1..d89412573 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -13,7 +13,6 @@
# by Keiju ISHITSUKA (Nippon Rational Inc.)
#
-require "tracer"
require "e2mmap"
require "irb/slex"
diff --git a/lib/tracer.rb b/lib/tracer.rb
index 893a9d582..71aa49c30 100644
--- a/lib/tracer.rb
+++ b/lib/tracer.rb
@@ -162,6 +162,6 @@ if $0 == __FILE__
ARGV.shift
Tracer.on
require $0
-else
+elsif caller(0).size == 1
Tracer.on
end