зеркало из https://github.com/github/ruby.git
* eval.c: remove ruby_last_node and assignments seems to be
unnecessary * intern.h: debug does not run if ID_ALLOCATOR is zero. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz
Родитель
17065d47a6
Коммит
9796a9bc1c
13
ChangeLog
13
ChangeLog
|
|
@ -1,3 +1,16 @@
|
|||
Wed Jan 8 15:54:05 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* eval.c: remove ruby_last_node and assignments seems to be
|
||||
unnecessary
|
||||
|
||||
* intern.h: debug does not run if ID_ALLOCATOR is zero.
|
||||
|
||||
Wed Jan 8 15:04:11 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* range.c (range_each): treat fixnums specially to boost.
|
||||
|
||||
* numeric.c (num_step): remove rb_scan_args() for small speedup.
|
||||
|
||||
Tue Jan 7 17:56:08 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* eval.c (svalue_to_avalue): should return converted array.
|
||||
|
|
|
|||
33
eval.c
33
eval.c
|
|
@ -115,7 +115,6 @@ static int scope_vmode;
|
|||
#define SCOPE_SET(f) (scope_vmode=(f))
|
||||
#define SCOPE_TEST(f) (scope_vmode&(f))
|
||||
|
||||
static NODE* ruby_last_node;
|
||||
NODE* ruby_current_node;
|
||||
int ruby_safe_level = 0;
|
||||
/* safe-level:
|
||||
|
|
@ -2108,7 +2107,7 @@ call_trace_func(event, node, self, id, klass)
|
|||
{
|
||||
int state;
|
||||
struct FRAME *prev;
|
||||
NODE *node_save[2];
|
||||
NODE *node_save;
|
||||
VALUE srcfile;
|
||||
|
||||
if (!trace_func) return;
|
||||
|
|
@ -2116,9 +2115,8 @@ call_trace_func(event, node, self, id, klass)
|
|||
if (ruby_in_compile) return;
|
||||
if (id == ID_ALLOCATOR) return;
|
||||
|
||||
node_save[0] = ruby_last_node;
|
||||
if (!(node_save[1] = ruby_current_node)) {
|
||||
node_save[1] = NEW_NEWLINE(0);
|
||||
if (!(node_save = ruby_current_node)) {
|
||||
node_save = NEW_NEWLINE(0);
|
||||
}
|
||||
tracing = 1;
|
||||
prev = ruby_frame;
|
||||
|
|
@ -2156,8 +2154,7 @@ call_trace_func(event, node, self, id, klass)
|
|||
POP_FRAME();
|
||||
|
||||
tracing = 0;
|
||||
ruby_last_node = node_save[0];
|
||||
ruby_current_node = node_save[1];
|
||||
ruby_current_node = node_save;
|
||||
SET_CURRENT_SOURCE();
|
||||
if (state) JUMP_TAG(state);
|
||||
}
|
||||
|
|
@ -2212,7 +2209,6 @@ rb_eval(self, n)
|
|||
VALUE self;
|
||||
NODE *n;
|
||||
{
|
||||
NODE *nodesave = ruby_current_node;
|
||||
NODE * volatile node = n;
|
||||
int state;
|
||||
volatile VALUE result = Qnil;
|
||||
|
|
@ -2225,7 +2221,7 @@ rb_eval(self, n)
|
|||
again:
|
||||
if (!node) RETURN(Qnil);
|
||||
|
||||
ruby_last_node = ruby_current_node = node;
|
||||
ruby_current_node = node;
|
||||
switch (nd_type(node)) {
|
||||
case NODE_BLOCK:
|
||||
while (node->nd_next) {
|
||||
|
|
@ -3324,7 +3320,7 @@ rb_eval(self, n)
|
|||
rb_include_module(klass, ruby_wrapper);
|
||||
}
|
||||
if (super) rb_class_inherited(super, klass);
|
||||
result = module_setup(klass, node->nd_body);
|
||||
result = module_setup(klass, node);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -3358,7 +3354,7 @@ rb_eval(self, n)
|
|||
rb_include_module(module, ruby_wrapper);
|
||||
}
|
||||
|
||||
result = module_setup(module, node->nd_body);
|
||||
result = module_setup(module, node);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -3380,7 +3376,7 @@ rb_eval(self, n)
|
|||
rb_include_module(klass, ruby_wrapper);
|
||||
}
|
||||
|
||||
result = module_setup(klass, node->nd_body);
|
||||
result = module_setup(klass, node);
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -3409,7 +3405,6 @@ rb_eval(self, n)
|
|||
}
|
||||
finish:
|
||||
CHECK_INTS;
|
||||
ruby_current_node = nodesave;
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -3418,7 +3413,7 @@ module_setup(module, n)
|
|||
VALUE module;
|
||||
NODE *n;
|
||||
{
|
||||
NODE * volatile node = n;
|
||||
NODE * volatile node = n->nd_body;
|
||||
int state;
|
||||
struct FRAME frame;
|
||||
VALUE result; /* OK */
|
||||
|
|
@ -3450,9 +3445,7 @@ module_setup(module, n)
|
|||
PUSH_TAG(PROT_NONE);
|
||||
if ((state = EXEC_TAG()) == 0) {
|
||||
if (trace_func) {
|
||||
call_trace_func("class", ruby_current_node, ruby_cbase,
|
||||
ruby_frame->last_func,
|
||||
ruby_frame->last_class);
|
||||
call_trace_func("class", n, ruby_cbase, ruby_frame->last_func, ruby_frame->last_class);
|
||||
}
|
||||
result = rb_eval(ruby_cbase, node->nd_next);
|
||||
}
|
||||
|
|
@ -3464,8 +3457,7 @@ module_setup(module, n)
|
|||
|
||||
ruby_frame = frame.tmp;
|
||||
if (trace_func) {
|
||||
call_trace_func("end", ruby_last_node, 0,
|
||||
ruby_frame->last_func, ruby_frame->last_class);
|
||||
call_trace_func("end", n, 0, ruby_frame->last_func, ruby_frame->last_class);
|
||||
}
|
||||
if (state) JUMP_TAG(state);
|
||||
|
||||
|
|
@ -4723,7 +4715,6 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
|
|||
if (trace_func) {
|
||||
call_trace_func("call", b2, recv, id, klass);
|
||||
}
|
||||
ruby_last_node = b2;
|
||||
result = rb_eval(recv, body);
|
||||
}
|
||||
else if (state == TAG_RETURN) {
|
||||
|
|
@ -4735,7 +4726,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, nosuper)
|
|||
POP_SCOPE();
|
||||
ruby_cref = saved_cref;
|
||||
if (trace_func) {
|
||||
call_trace_func("return", ruby_last_node, recv, id, klass);
|
||||
call_trace_func("return", ruby_frame->prev->node, recv, id, klass);
|
||||
}
|
||||
switch (state) {
|
||||
case 0:
|
||||
|
|
|
|||
2
intern.h
2
intern.h
|
|
@ -17,7 +17,7 @@
|
|||
* the kernel.
|
||||
*/
|
||||
|
||||
#define ID_ALLOCATOR 0
|
||||
#define ID_ALLOCATOR 1
|
||||
|
||||
/* array.c */
|
||||
void rb_mem_clear _((register VALUE*, register long));
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче