diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-11 05:42:31 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-11 05:42:31 +0000 |
| commit | c27c68b8db983e186ab030bb5278bcf16fd055c1 (patch) | |
| tree | 1a2d5b1fd5bd27e7d1966c033d6e41f333f7c86e | |
| parent | 729615e6cddd0efa45dae8d5b9651437ef8f034c (diff) | |
* class.c (clone_method): should copy cbase in cref as well.
[ruby-dev:35116]
* node.h (NEW_CREF): new NEW_ macro.
* eval.c (PUSH_CREF): use NEW_CREF().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@18485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | class.c | 5 | ||||
| -rw-r--r-- | eval.c | 2 | ||||
| -rw-r--r-- | node.h | 2 |
4 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,12 @@ +Mon Aug 11 14:39:46 2008 Yukihiro Matsumoto <[email protected]> + + * class.c (clone_method): should copy cbase in cref as well. + [ruby-dev:35116] + + * node.h (NEW_CREF): new NEW_ macro. + + * eval.c (PUSH_CREF): use NEW_CREF(). + Sun Aug 10 12:29:18 2008 Nobuyoshi Nakada <[email protected]> * config.{guess,sub}: updated to automake-1.10.1. @@ -62,7 +62,10 @@ clone_method(mid, body, data) NODE *fbody = body->nd_body; if (fbody && nd_type(fbody) == NODE_SCOPE) { - fbody = rb_copy_node_scope(fbody, ruby_cref); + NODE *cref = (NODE*)fbody->nd_rval; + + if (cref) cref = cref->nd_next; + fbody = rb_copy_node_scope(fbody, NEW_CREF(data->klass, cref)); } st_insert(data->tbl, mid, (st_data_t)NEW_METHOD(fbody, body->nd_noex)); return ST_CONTINUE; @@ -1065,7 +1065,7 @@ static VALUE ruby_wrapper; /* security wrapper */ NODE *ruby_cref = 0; NODE *ruby_top_cref; -#define PUSH_CREF(c) ruby_cref = NEW_NODE(NODE_CREF,(c),0,ruby_cref) +#define PUSH_CREF(c) ruby_cref = NEW_CREF(c,ruby_cref) #define POP_CREF() ruby_cref = ruby_cref->nd_next #define PUSH_SCOPE() do { \ @@ -319,7 +319,7 @@ extern NODE *ruby_top_cref; #define NEW_MODULE(n,b) NEW_NODE(NODE_MODULE,n,NEW_SCOPE(b),0) #define NEW_COLON2(c,i) NEW_NODE(NODE_COLON2,c,i,0) #define NEW_COLON3(i) NEW_NODE(NODE_COLON3,0,i,0) -#define NEW_CREF(c) (NEW_NODE(NODE_CREF,0,0,c)) +#define NEW_CREF(c,n) NEW_NODE(NODE_CREF,c,0,n) #define NEW_DOT2(b,e) NEW_NODE(NODE_DOT2,b,e,0) #define NEW_DOT3(b,e) NEW_NODE(NODE_DOT3,b,e,0) #define NEW_ATTRSET(a) NEW_NODE(NODE_ATTRSET,a,0,0) |