matz	2008-02-18 14:33:01 +0900 (Mon, 18 Feb 2008)

  New Revision: 15537

  Modified files:
    trunk/ChangeLog
    trunk/compile.c
    trunk/debug.c
    trunk/include/ruby/node.h
    trunk/parse.y

  Log:
    * include/ruby/node.h (NODE_FL_NEWLINE): renamed from NODE_NEWLINE
      to denote its a flag.  [ruby-core:15529]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/compile.c?r1=15537&r2=15536&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/parse.y?r1=15537&r2=15536&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15537&r2=15536&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/node.h?r1=15537&r2=15536&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/debug.c?r1=15537&r2=15536&diff_format=u

Index: debug.c
===================================================================
--- debug.c	(revision 15536)
+++ debug.c	(revision 15537)
@@ -56,11 +56,11 @@
         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;
 
Index: include/ruby/node.h
===================================================================
--- include/ruby/node.h	(revision 15536)
+++ include/ruby/node.h	(revision 15537)
@@ -268,8 +268,8 @@
 
 #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)
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15536)
+++ ChangeLog	(revision 15537)
@@ -200,6 +200,11 @@
 
 	* test/win32ole/test_win32ole.rb: ditto.
 
+Fri Feb 15 19:31:23 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@r...>
 
 	* string.c (rb_str_sub_bang, str_gsub): allows hash for replacement.
Index: compile.c
===================================================================
--- compile.c	(revision 15536)
+++ compile.c	(revision 15537)
@@ -2676,7 +2676,7 @@
 
     type = nd_type(node);
 
-    if (node->flags & NODE_NEWLINE) {
+    if (node->flags & NODE_FL_NEWLINE) {
 	ADD_TRACE(ret, nd_line(node), RUBY_EVENT_LINE);
     }
 
Index: parse.y
===================================================================
--- parse.y	(revision 15536)
+++ parse.y	(revision 15537)
@@ -3844,7 +3844,7 @@
 			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 @@
 {
     if (node) {
 	node = remove_begin(node);
-	node->flags |= NODE_NEWLINE;
+	node->flags |= NODE_FL_NEWLINE;
     }
     return node;
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/