diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-05-28 03:20:04 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-05-28 03:20:04 +0000 |
commit | ff3d6d201d72eaa0f21dc376d59f4ba2a3acad92 (patch) | |
tree | d84849f3e2e4804ada7d4dac34c5da75167d8c93 /eval.c | |
parent | 1fe8b3742528ccfabee751d7f42317f53d6fdda7 (diff) |
* eval.c (scope_node): trick to keep the node has a scope.
* eval.c (rb_eval): NODE_EVSTR: write back local_tbl to the node.
* eval.c (rb_eval): NODE_SCOPE: hold the scope node in ruby_scope.
* eval.c (module_setup): ditto.
* eval.c (rb_call0): ditto.
* node.h (NEW_DASGN, NEW_DASGN_CURR): remove surplus semicolons.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -840,6 +840,7 @@ static NODE *top_cref; #define PUSH_CREF(c) ruby_cref = rb_node_newnode(NODE_CREF,(c),0,ruby_cref) #define POP_CREF() ruby_cref = ruby_cref->nd_next +#define scope_node super.klass #define PUSH_SCOPE() do { \ volatile int _vmode = scope_vmode; \ struct SCOPE * volatile _old; \ @@ -2783,6 +2784,7 @@ rb_eval(self, n) ruby_cref = (NODE*)node->nd_rval; ruby_frame->cbase = node->nd_rval; } + ruby_scope->scope_node = (VALUE)node; if (node->nd_tbl) { VALUE *vars = ALLOCA_N(VALUE, node->nd_tbl[0]+1); *vars++ = (VALUE)node; @@ -3076,6 +3078,14 @@ rb_eval(self, n) list->nd_head = compile(list->nd_head->nd_lit, ruby_sourcefile, ruby_sourceline); + if (ruby_scope->local_tbl) { + NODE *body = (NODE *)ruby_scope->scope_node; + if (body && body->nd_tbl != ruby_scope->local_tbl) { + if (body->nd_tbl) free(body->nd_tbl); + ruby_scope->local_vars[-1] = + (VALUE)(body->nd_tbl = ruby_scope->local_tbl); + } + } ruby_eval_tree = 0; ruby_in_eval--; if (ruby_nerrs > 0) { @@ -3413,6 +3423,7 @@ module_setup(module, n) PUSH_SCOPE(); PUSH_VARS(); + ruby_scope->scope_node = (VALUE)node; if (node->nd_tbl) { VALUE *vars = TMP_ALLOC(node->nd_tbl[0]+1); *vars++ = (VALUE)node; @@ -4552,6 +4563,7 @@ rb_call0(klass, recv, id, argc, argv, body, nosuper) ruby_cref = (NODE*)body->nd_rval; ruby_frame->cbase = body->nd_rval; } + ruby_scope->scope_node = (VALUE)body; if (body->nd_tbl) { local_vars = TMP_ALLOC(body->nd_tbl[0]+1); *local_vars++ = (VALUE)body; |