From 54062fed1199263720ec1ac20226f3d7ab18db6c Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 30 Nov 2007 18:30:49 +0000 Subject: * parse.y (newline_node): set line from outermost node before removing NODE_BEGIN. [ruby-dev:32406] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@14059 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ parse.y | 13 ++++++++----- version.h | 8 ++++---- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c9864aed21..1f7a1216c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 1 03:30:47 2007 Nobuyoshi Nakada + + * 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 * lib/rss/rss.rb, test/rss/test_version.rb: 0.2.0 -> 0.2.1. diff --git a/parse.y b/parse.y index 9b8cf15875..414c775fd1 100644 --- a/parse.y +++ b/parse.y @@ -398,11 +398,11 @@ compstmt : stmts opt_terms 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 @@ newline_node(node) { 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; } diff --git a/version.h b/version.h index 06483f5203..c54748c428 100644 --- a/version.h +++ b/version.h @@ -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[]; -- cgit v1.2.3