* eval.c (rb_eval): call trace_func for if/while conditions.

* marshal.c (r_object): separate r_regist from proc calling.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2139 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 0 deletions

diff --git a/eval.c b/eval.c
index e6bcdc859e..26962c2e17 100644
--- a/eval.c
+++ b/eval.c
@@ -2231,6 +2231,11 @@ rb_eval(self, n)
 
       case NODE_IF:
 	ruby_sourceline = nd_line(node);
+	if (trace_func) {
+	    call_trace_func("line", node->nd_file, ruby_sourceline, self,
+			    ruby_frame->last_func,
+			    ruby_frame->last_class);	
+	}
 	if (RTEST(rb_eval(self, node->nd_cond))) {
 	    node = node->nd_body;
 	}
@@ -2361,6 +2366,7 @@ rb_eval(self, n)
 	result = Qnil;
 	switch (state = EXEC_TAG()) {
 	  case 0:
+	    ruby_sourceline = nd_line(node);
 	    if (node->nd_state && RTEST(rb_eval(self, node->nd_cond)))
 		goto until_out;
 	    do {