diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-04 08:54:56 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-04 08:54:56 +0000 |
commit | bc2c2f915c304b3601fe70506dad9ae17aedd82a (patch) | |
tree | c29e09afe00878197975211eddae6de3fd92c66b | |
parent | 857099f5b926034af2bcaf37b302bb5e40f0d87c (diff) |
merges r20469 from trunk into ruby_1_9_1.
* parse.y (expr): keyword_not can continue across newline.
[ruby-core:20252]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | parse.y | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed Dec 3 22:54:39 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (expr): keyword_not can continue across newline. + [ruby-core:20252] + Wed Dec 3 14:48:52 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/tk/tcltklib.c (ip_ruby_cmd, ip_invoke_with_position): must @@ -1174,12 +1174,12 @@ expr : command_call $$ = dispatch3(binary, $1, ripper_intern("or"), $3); %*/ } - | keyword_not expr + | keyword_not opt_nl expr { /*%%%*/ - $$ = call_uni_op(cond($2), '!'); + $$ = call_uni_op(cond($3), '!'); /*% - $$ = dispatch2(unary, ripper_intern("not"), $2); + $$ = dispatch2(unary, ripper_intern("not"), $3); %*/ } | '!' command_call |