diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-21 16:47:23 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-21 16:47:23 +0000 |
| commit | 002517aba82f3d318dab09f603491417240bfe0f (patch) | |
| tree | 552aae90929d0812fd6a5d08e43c870add3a35a5 /node.h | |
| parent | d0149b9e210450113353e9bc8dc1f151f4563313 (diff) | |
| download | ruby-002517aba82f3d318dab09f603491417240bfe0f.tar.gz | |
* parse.y (newline_node): do not use NODE_NEWLINE node anymore,
use NEWLINE flag instead.
* ext/socket/socket.c (sock_gethostbyname): returns host if
ai_canonname is NULL. (ruby-bugs PR#1243)
* parse.y (block_append): update nd_end for "real" head node.
[ruby-list:39058]
* marshal.c (w_class): should not dump singleton class.
[ruby-dev:22631]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'node.h')
| -rw-r--r-- | node.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -113,7 +113,6 @@ enum node_type { NODE_TRUE, NODE_FALSE, NODE_DEFINED, - NODE_NEWLINE, NODE_POSTEXE, #ifdef C_ALLOCA NODE_ALLOCA, @@ -155,10 +154,12 @@ typedef struct RNode { #define RNODE(obj) (R_CAST(RNode)(obj)) -#define nd_type(n) ((int)(((RNODE(n))->flags>>FL_USHIFT)&0xff)) +#define nd_type(n) ((int)(((RNODE(n))->flags>>FL_USHIFT)&0x7f)) #define nd_set_type(n,t) \ RNODE(n)->flags=((RNODE(n)->flags&~FL_UMASK)|(((t)<<FL_USHIFT)&FL_UMASK)) +#define NODE_NEWLINE FL_USER7 + #define NODE_LSHIFT (FL_USHIFT+8) #define NODE_LMASK (((long)1<<(sizeof(NODE*)*CHAR_BIT-NODE_LSHIFT))-1) #define nd_line(n) ((unsigned int)(((RNODE(n))->flags>>NODE_LSHIFT)&NODE_LMASK)) @@ -330,7 +331,6 @@ typedef struct RNode { #define NEW_TRUE() NEW_NODE(NODE_TRUE,0,0,0) #define NEW_FALSE() NEW_NODE(NODE_FALSE,0,0,0) #define NEW_DEFINED(e) NEW_NODE(NODE_DEFINED,e,0,0) -#define NEW_NEWLINE(n) NEW_NODE(NODE_NEWLINE,0,0,n) #define NEW_PREEXE(b) NEW_SCOPE(b) #define NEW_POSTEXE() NEW_NODE(NODE_POSTEXE,0,0,0) #define NEW_DMETHOD(b) NEW_NODE(NODE_DMETHOD,0,0,b) |