ruby-changes:2554
From: ko1@a...
Date: 29 Nov 2007 16:59:30 +0900
Subject: [ruby-changes:2554] nobu - Ruby:r14045 (trunk, ruby_1_8): * parse.y (stmt): remove unnecessary NODE_BEGIN.
nobu 2007-11-29 16:59:12 +0900 (Thu, 29 Nov 2007)
New Revision: 14045
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/parse.y
branches/ruby_1_8/version.h
trunk/ChangeLog
trunk/parse.y
trunk/version.h
Log:
* parse.y (stmt): remove unnecessary NODE_BEGIN. [ruby-core:13814]
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=14045&r2=14044
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=14045&r2=14044
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/parse.y?r1=14045&r2=14044
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14045&r2=14044
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=14045&r2=14044
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/parse.y?r1=14045&r2=14044
Index: ChangeLog
===================================================================
--- ChangeLog (revision 14044)
+++ ChangeLog (revision 14045)
@@ -1,3 +1,7 @@
+Thu Nov 29 16:59:10 2007 Nobuyoshi Nakada <nobu@r...>
+
+ * parse.y (stmt): remove unnecessary NODE_BEGIN. [ruby-core:13814]
+
Wed Nov 28 18:08:00 2007 NARUSE, Yui <naruse@r...>
* ext/json, lib/json, test/json: Update to JSON 1.1.2.
Index: parse.y
===================================================================
--- parse.y (revision 14044)
+++ parse.y (revision 14045)
@@ -345,7 +345,8 @@
static void void_expr_gen(struct parser_params*,NODE*);
static NODE *remove_begin(NODE*);
#define value_expr(node) value_expr_gen(parser, (node) = remove_begin(node))
-#define void_expr(node) void_expr_gen(parser, (node) = remove_begin(node))
+#define void_expr0(node) void_expr_gen(parser, (node))
+#define void_expr(node) void_expr0((node) = remove_begin(node))
static void void_stmts_gen(struct parser_params*,NODE*);
#define void_stmts(node) void_stmts_gen(parser, node)
static void reduce_nodes_gen(struct parser_params*,NODE**);
@@ -798,10 +799,9 @@
{
/*%%%*/
void_stmts($1);
- $$ = $1;
/*%
+ %*/
$$ = $1;
- %*/
}
;
@@ -884,7 +884,7 @@
| stmt modifier_if expr_value
{
/*%%%*/
- $$ = NEW_IF(cond($3), $1, 0);
+ $$ = NEW_IF(cond($3), remove_begin($1), 0);
fixpos($$, $3);
if (cond_negative(&$$->nd_cond)) {
$$->nd_else = $$->nd_body;
@@ -897,7 +897,7 @@
| stmt modifier_unless expr_value
{
/*%%%*/
- $$ = NEW_UNLESS(cond($3), $1, 0);
+ $$ = NEW_UNLESS(cond($3), remove_begin($1), 0);
fixpos($$, $3);
if (cond_negative(&$$->nd_cond)) {
$$->nd_body = $$->nd_else;
@@ -942,7 +942,8 @@
| stmt modifier_rescue stmt
{
/*%%%*/
- $$ = NEW_RESCUE($1, NEW_RESBODY(0,$3,0), 0);
+ NODE *resq = NEW_RESBODY(0, remove_begin($3), 0);
+ $$ = NEW_RESCUE(remove_begin($1), resq, 0);
/*%
$$ = dispatch2(rescue_mod, $3, $1);
%*/
@@ -7943,7 +7944,7 @@
for (;;) {
if (!node->nd_next) return;
- void_expr(node->nd_head);
+ void_expr0(node->nd_head);
node = node->nd_next;
}
}
Index: version.h
===================================================================
--- version.h (revision 14044)
+++ version.h (revision 14045)
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-11-28"
+#define RUBY_RELEASE_DATE "2007-11-29"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20071128
+#define RUBY_RELEASE_CODE 20071129
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 29
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/parse.y
===================================================================
--- ruby_1_8/parse.y (revision 14044)
+++ ruby_1_8/parse.y (revision 14045)
@@ -398,15 +398,15 @@
stmts : none
| stmt
{
- $$ = newline_node($1);
+ $$ = newline_node(remove_begin($1));
}
| stmts terms stmt
{
- $$ = block_append($1, newline_node($3));
+ $$ = block_append($1, newline_node(remove_begin($3)));
}
| error stmt
{
- $$ = $2;
+ $$ = remove_begin($2);
}
;
@@ -436,7 +436,7 @@
}
| stmt kIF_MOD expr_value
{
- $$ = NEW_IF(cond($3), $1, 0);
+ $$ = NEW_IF(cond($3), remove_begin($1), 0);
fixpos($$, $3);
if (cond_negative(&$$->nd_cond)) {
$$->nd_else = $$->nd_body;
@@ -445,7 +445,7 @@
}
| stmt kUNLESS_MOD expr_value
{
- $$ = NEW_UNLESS(cond($3), $1, 0);
+ $$ = NEW_UNLESS(cond($3), remove_begin($1), 0);
fixpos($$, $3);
if (cond_negative(&$$->nd_cond)) {
$$->nd_body = $$->nd_else;
@@ -478,7 +478,8 @@
}
| stmt kRESCUE_MOD stmt
{
- $$ = NEW_RESCUE($1, NEW_RESBODY(0,$3,0), 0);
+ NODE *resq = NEW_RESBODY(0, remove_begin($3), 0);
+ $$ = NEW_RESCUE(remove_begin($1), resq, 0);
}
| klBEGIN
{
@@ -5206,7 +5207,7 @@
for (;;) {
if (!node->nd_next) return;
- void_expr(node->nd_head);
+ void_expr0(node->nd_head);
node = node->nd_next;
}
}
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 14044)
+++ ruby_1_8/ChangeLog (revision 14045)
@@ -1,3 +1,7 @@
+Thu Nov 29 16:59:10 2007 Nobuyoshi Nakada <nobu@r...>
+
+ * parse.y (stmt): remove unnecessary NODE_BEGIN. [ruby-core:13814]
+
Wed Nov 28 14:43:14 2007 Nobuyoshi Nakada <nobu@r...>
* ext/extmk.rb (extract_makefile): use dldflags instead of DLDFLAGS to
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h (revision 14044)
+++ ruby_1_8/version.h (revision 14045)
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-11-28"
+#define RUBY_RELEASE_DATE "2007-11-29"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071128
+#define RUBY_RELEASE_CODE 20071129
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 28
+#define RUBY_RELEASE_DAY 29
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml