diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-11 23:13:01 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-11 23:13:01 +0000 |
commit | 08f3cfb5859332c0f7a9a574dc64a2a002c50354 (patch) | |
tree | 9b88e32745288764702ef3685d3b10b5b1d175a8 /node.h | |
parent | 287b046fab9fc07f228977de7e0dc087f29d2516 (diff) | |
download | ruby-08f3cfb5859332c0f7a9a574dc64a2a002c50354.tar.gz |
* internal.h: use T_IMEMO to represent `struct MEMO' value.
memo->v1 and memo->v2 is WB protected values.
So use MEMO_V1/V2_SET() macros to set these values.
memo->u3 is ambiguous (sometimes a VALUE, sometimes an integer
value), so use gc_mark_maybe() in gc.c to mark it.
Rename NEW_MEMO() to MEMO_NEW().
Move MEMO_FOR and NEW_MEMO_FOF macros from node.h.
Export a rb_imemo_new() function for ext/ripper.
* node.h: remove NODE_MEMO.
* enum.c: catch up these change.
* enumerator.c: ditto.
* load.c: ditto.
* ext/objspace/objspace.c (count_nodes): ditto.
* gc.c (gc_mark_children): mark imemo_memo type.
* parse.y (new_args_gen): use T_IMEMO.
(I'm not sure it is working correctly...)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49942 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'node.h')
-rw-r--r-- | node.h | 8 |
1 files changed, 0 insertions, 8 deletions
@@ -218,8 +218,6 @@ enum node_type { #define NODE_ALLOCA NODE_ALLOCA NODE_BMETHOD, #define NODE_BMETHOD NODE_BMETHOD - NODE_MEMO, -#define NODE_MEMO NODE_MEMO NODE_DSYM, #define NODE_DSYM NODE_DSYM NODE_ATTRASGN, @@ -455,12 +453,6 @@ typedef struct RNode { #define NEW_BMETHOD(b) NEW_NODE(NODE_BMETHOD,0,0,b) #define NEW_ATTRASGN(r,m,a) NEW_NODE(NODE_ATTRASGN,r,m,a) #define NEW_PRELUDE(p,b) NEW_NODE(NODE_PRELUDE,p,b,0) -#define NEW_MEMO(a,b,c) ((struct MEMO *)NEW_NODE(NODE_MEMO,a,b,c)) - -#define roomof(x, y) ((sizeof(x) + sizeof(y) - 1) / sizeof(y)) -#define MEMO_FOR(type, value) ((type *)RARRAY_PTR(value)) -#define NEW_MEMO_FOR(type, value) \ - ((value) = rb_ary_tmp_new_fill(roomof(type, VALUE)), MEMO_FOR(type, value)) RUBY_SYMBOL_EXPORT_BEGIN |