nobu	2007-12-01 03:30:49 +0900 (Sat, 01 Dec 2007)

  New Revision: 14059

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/parse.y
    branches/ruby_1_8/version.h

  Log:
    * parse.y (newline_node): set line from outermost node before removing
      NODE_BEGIN.  [ruby-dev:32406]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=14059&r2=14058
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=14059&r2=14058
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/parse.y?r1=14059&r2=14058

Index: ruby_1_8/parse.y
===================================================================
--- ruby_1_8/parse.y	(revision 14058)
+++ ruby_1_8/parse.y	(revision 14059)
@@ -398,11 +398,11 @@
 stmts		: none
 		| stmt
 		    {
-			$$ = newline_node(remove_begin($1));
+			$$ = newline_node($1);
 		    }
 		| stmts terms stmt
 		    {
-			$$ = block_append($1, newline_node(remove_begin($3)));
+			$$ = block_append($1, newline_node($3));
 		    }
 		| error stmt
 		    {
@@ -4549,10 +4549,13 @@
 {
     NODE *nl = 0;
     if (node) {
+	int line;
 	if (nd_type(node) == NODE_NEWLINE) return node;
-        nl = NEW_NEWLINE(node);
-        fixpos(nl, node);
-        nl->nd_nth = nd_line(node);
+	line = nd_line(node);
+	node = remove_begin(node);
+	nl = NEW_NEWLINE(node);
+	nd_set_line(nl, line);
+	nl->nd_nth = line;
     }
     return nl;
 }
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 14058)
+++ ruby_1_8/ChangeLog	(revision 14059)
@@ -1,3 +1,8 @@
+Sat Dec  1 03:30:47 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* parse.y (newline_node): set line from outermost node before removing
+	  NODE_BEGIN.  [ruby-dev:32406]
+
 Fri Nov 30 21:53:28 2007  Kouhei Sutou  <kou@c...>
 
 	* lib/rss/rss.rb, test/rss/test_version.rb: 0.2.0 -> 0.2.1.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 14058)
+++ ruby_1_8/version.h	(revision 14059)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-11-29"
+#define RUBY_RELEASE_DATE "2007-12-01"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071129
+#define RUBY_RELEASE_CODE 20071201
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
-#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_MONTH 12
+#define RUBY_RELEASE_DAY 1
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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