diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 19:48:34 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-07 19:48:34 +0000 |
commit | b2c93b3dce364e3cd4d256ecda5f2ad03004dcbb (patch) | |
tree | 4f4cdab2aa0df677e6a89e3c8fa455d43350fda7 | |
parent | 01dabde0e80631e1d9d713345688bd13c2544c55 (diff) |
merge revision(s) 14045, 14059:
* 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
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | parse.y | 20 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 22 insertions, 9 deletions
@@ -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] @@ -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; } } @@ -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 |