merge revision(s) 14045, 14059:

shyouhei · shyouhei · commit b2c93b3dce36 · 2008-06-07T19:48:34.000Z
* parse.y (stmt): remove unnecessary NODE_BEGIN.  [ruby-core:13814]
	* 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_5@16960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Jun  8 04:46:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (newline_node): set line from outermost node before removing
+	  NODE_BEGIN.  [ruby-dev:32406]
+
+Sun Jun  8 04:37:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (stmt): remove unnecessary NODE_BEGIN.  [ruby-core:13814]
+
 Sun Jun  8 04:18:50 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* object.c (nil_plus): remove unused function.  [ruby-core:13737]
diff --git a/parse.y b/parse.y
@@ -406,7 +406,7 @@ stmts		: none
 		    }
 		| error stmt
 		    {
-			$$ = $2;
+			$$ = remove_begin($2);
 		    }
 		;
 
@@ -436,7 +436,7 @@ stmt		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 		    }
 		| 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		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 		    }
 		| 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		: kALIAS fitem {lex_state = EXPR_FNAME;} fitem
 		    }
 		| 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
 		    {
@@ -4555,10 +4556,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;
 }
@@ -5213,7 +5217,7 @@ void_stmts(node)
 
     for (;;) {
 	if (!node->nd_next) return;
-	void_expr(node->nd_head);
+	void_expr0(node->nd_head);
 	node = node->nd_next;
     }
 }
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 151
+#define RUBY_PATCHLEVEL 153
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ stmts : none`
`406`	`406`	`}`
`407`	`407`	`\| error stmt`
`408`	`408`	`{`
`409`		`- $$ = $2;`
	`409`	`+ $$ = remove_begin($2);`
`410`	`410`	`}`
`411`	`411`	`;`
`412`	`412`
`@@ -436,7 +436,7 @@ stmt : kALIAS fitem {lex_state = EXPR_FNAME;} fitem`
`436`	`436`	`}`
`437`	`437`	`\| stmt kIF_MOD expr_value`
`438`	`438`	`{`
`439`		`- $$ = NEW_IF(cond($3), $1, 0);`
	`439`	`+ $$ = NEW_IF(cond($3), remove_begin($1), 0);`
`440`	`440`	`fixpos($$, $3);`
`441`	`441`	`if (cond_negative(&$$->nd_cond)) {`
`442`	`442`	`$$->nd_else = $$->nd_body;`
`@@ -445,7 +445,7 @@ stmt : kALIAS fitem {lex_state = EXPR_FNAME;} fitem`
`445`	`445`	`}`
`446`	`446`	`\| stmt kUNLESS_MOD expr_value`
`447`	`447`	`{`
`448`		`- $$ = NEW_UNLESS(cond($3), $1, 0);`
	`448`	`+ $$ = NEW_UNLESS(cond($3), remove_begin($1), 0);`
`449`	`449`	`fixpos($$, $3);`
`450`	`450`	`if (cond_negative(&$$->nd_cond)) {`
`451`	`451`	`$$->nd_body = $$->nd_else;`
`@@ -478,7 +478,8 @@ stmt : kALIAS fitem {lex_state = EXPR_FNAME;} fitem`
`478`	`478`	`}`
`479`	`479`	`\| stmt kRESCUE_MOD stmt`
`480`	`480`	`{`
`481`		`- $$ = NEW_RESCUE($1, NEW_RESBODY(0,$3,0), 0);`
	`481`	`+ NODE *resq = NEW_RESBODY(0, remove_begin($3), 0);`
	`482`	`+ $$ = NEW_RESCUE(remove_begin($1), resq, 0);`
`482`	`483`	`}`
`483`	`484`	`\| klBEGIN`
`484`	`485`	`{`
`@@ -4555,10 +4556,13 @@ newline_node(node)`
`4555`	`4556`	`{`
`4556`	`4557`	`NODE *nl = 0;`
`4557`	`4558`	`if (node) {`
	`4559`	`+ int line;`
`4558`	`4560`	`if (nd_type(node) == NODE_NEWLINE) return node;`
`4559`		`- nl = NEW_NEWLINE(node);`
`4560`		`- fixpos(nl, node);`
`4561`		`- nl->nd_nth = nd_line(node);`
	`4561`	`+ line = nd_line(node);`
	`4562`	`+ node = remove_begin(node);`
	`4563`	`+ nl = NEW_NEWLINE(node);`
	`4564`	`+ nd_set_line(nl, line);`
	`4565`	`+ nl->nd_nth = line;`
`4562`	`4566`	`}`
`4563`	`4567`	`return nl;`
`4564`	`4568`	`}`
`@@ -5213,7 +5217,7 @@ void_stmts(node)`
`5213`	`5217`
`5214`	`5218`	`for (;;) {`
`5215`	`5219`	`if (!node->nd_next) return;`
`5216`		`- void_expr(node->nd_head);`
	`5220`	`+ void_expr0(node->nd_head);`
`5217`	`5221`	`node = node->nd_next;`
`5218`	`5222`	`}`
`5219`	`5223`	`}`