aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-30 18:34:34 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-11-30 18:34:34 +0000
commit4afa82056c42f9f2010fbc9d17c5aa3887610e2b (patch)
tree9a8a3fdf18b44cba617f72219065aeba00a1c3f3
parent0edabec626f48ccc32be8587f853a785d996fa15 (diff)
downloadruby-4afa82056c42f9f2010fbc9d17c5aa3887610e2b.tar.gz
* parse.y (newline_node): always remove NODE_BEGIN.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14060 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--parse.y5
-rw-r--r--version.h8
3 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a732b4cb7..f696a9d01a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Dec 1 03:34:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (newline_node): always remove NODE_BEGIN.
+
Fri Nov 30 23:48:07 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* signal.c (ruby_signal): use SA_SIGINFO if available.
diff --git a/parse.y b/parse.y
index 38d7d6da49..972e0ebc21 100644
--- a/parse.y
+++ b/parse.y
@@ -817,7 +817,7 @@ stmts : none
| stmt
{
/*%%%*/
- $$ = newline_node(remove_begin($1));
+ $$ = newline_node($1);
/*%
$$ = dispatch2(stmts_add, dispatch0(stmts_new), $1);
%*/
@@ -825,7 +825,7 @@ stmts : none
| stmts terms stmt
{
/*%%%*/
- $$ = block_append($1, newline_node(remove_begin($3)));
+ $$ = block_append($1, newline_node($3));
/*%
$$ = dispatch2(stmts_add, $1, $3);
%*/
@@ -7281,6 +7281,7 @@ static NODE*
newline_node(NODE *node)
{
if (node) {
+ node = remove_begin(node);
node->flags |= NODE_NEWLINE;
}
return node;
diff --git a/version.h b/version.h
index 7b067f8156..9f02000398 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-11-30"
+#define RUBY_RELEASE_DATE "2007-12-01"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071130
+#define RUBY_RELEASE_CODE 20071201
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
-#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 12
+#define RUBY_RELEASE_DAY 1
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];