summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 16:32:59 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-15 16:32:59 +0000
commit740bbaed0efbfe727d7ddd627803a8cb7d603af2 (patch)
treebd7a46fcdf7e731072661d7af9bbb5201a22ce71
parentc68490037a060b14bc9e7bb3d5f86f58f9e44686 (diff)
merges r21570 from trunk into ruby_1_9_1.
* lib/debug.rb: as wanabe-san pointed out, set_trace_func should be completely final task in debug.rb. Bug #847 [ruby-core:20449] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/debug.rb6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 054910b41..49fd56fdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 16 00:57:34 2009 Koichi Sasada <ko1@atdot.net>
+
+ * lib/debug.rb: as wanabe-san pointed out,
+ set_trace_func should be completely final task in debug.rb.
+ Bug #847 [ruby-core:20449]
+
Fri Jan 16 00:27:03 2009 Koichi Sasada <ko1@atdot.net>
* vm.c (rb_vm_inc_const_missing_count, ruby_vm_const_missing_count):
diff --git a/lib/debug.rb b/lib/debug.rb
index 77be345a0..7bb145019 100644
--- a/lib/debug.rb
+++ b/lib/debug.rb
@@ -898,10 +898,10 @@ end
stdout.printf "Debug.rb\n"
stdout.printf "Emacs support available.\n\n"
-set_trace_func proc { |event, file, line, id, binding, klass, *rest|
- DEBUGGER__.context.trace_func event, file, line, id, binding, klass
-}
RubyVM::InstructionSequence.compile_option = {
trace_instruction: true
}
+set_trace_func proc { |event, file, line, id, binding, klass, *rest|
+ DEBUGGER__.context.trace_func event, file, line, id, binding, klass
+}
end