merges r20469 from trunk into ruby_1_9_1.

* parse.y (expr): keyword_not can continue across newline.
  [ruby-core:20252]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 8f6998926..8f6138ac0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/parse.y b/parse.y
index 44000df50..63f5e3c92 100644
--- a/parse.y
+++ b/parse.y
@@ -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