diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | compile.c | 2 | ||||
-rw-r--r-- | debug.c | 2 | ||||
-rw-r--r-- | include/ruby/node.h | 4 | ||||
-rw-r--r-- | parse.y | 4 |
5 files changed, 11 insertions, 6 deletions
@@ -200,6 +200,11 @@ Fri Feb 15 20:29:42 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp> * test/win32ole/test_win32ole.rb: ditto. +Fri Feb 15 19:31:23 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * include/ruby/node.h (NODE_FL_NEWLINE): renamed from NODE_NEWLINE + to denote its a flag. [ruby-core:15529] + Fri Feb 15 18:23:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_sub_bang, str_gsub): allows hash for replacement. @@ -2676,7 +2676,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped) type = nd_type(node); - if (node->flags & NODE_NEWLINE) { + if (node->flags & NODE_FL_NEWLINE) { ADD_TRACE(ret, nd_line(node), RUBY_EVENT_LINE); } @@ -56,11 +56,11 @@ static const union { RUBY_FL_USER18 = FL_USER18, RUBY_FL_USER19 = FL_USER19, RUBY_FL_USHIFT = FL_USHIFT, - RUBY_NODE_NEWLINE = NODE_NEWLINE, RUBY_NODE_TYPESHIFT = NODE_TYPESHIFT, RUBY_NODE_TYPEMASK = NODE_TYPEMASK, RUBY_NODE_LSHIFT = NODE_LSHIFT, RUBY_NODE_LMASK = NODE_LMASK, + RUBY_NODE_FL_NEWLINE = NODE_FL_NEWLINE, } various; } dummy_gdb_enums; diff --git a/include/ruby/node.h b/include/ruby/node.h index d3533a414a..b72a3e9f3c 100644 --- a/include/ruby/node.h +++ b/include/ruby/node.h @@ -268,8 +268,8 @@ typedef struct RNode { #define RNODE(obj) (R_CAST(RNode)(obj)) -/* 0..4:T_TYPES, 5:FL_MARK, 6:reserved, 7:NODE_NEWLINE */ -#define NODE_NEWLINE (((VALUE)1)<<7) +/* 0..4:T_TYPES, 5:FL_MARK, 6:reserved, 7:NODE_FL_NEWLINE */ +#define NODE_FL_NEWLINE (((VALUE)1)<<7) #define NODE_TYPESHIFT 8 #define NODE_TYPEMASK (((VALUE)0x7f)<<NODE_TYPESHIFT) @@ -3844,7 +3844,7 @@ string_content : tSTRING_CONTENT COND_LEXPOP(); CMDARG_LEXPOP(); /*%%%*/ - if ($3) $3->flags &= ~NODE_NEWLINE; + if ($3) $3->flags &= ~NODE_FL_NEWLINE; $$ = new_evstr($3); /*% $$ = dispatch1(string_embexpr, $3); @@ -7339,7 +7339,7 @@ newline_node(NODE *node) { if (node) { node = remove_begin(node); - node->flags |= NODE_NEWLINE; + node->flags |= NODE_FL_NEWLINE; } return node; } |