From 0fb38be6e318bc63e2e715ba411fd13962c1b875 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 12 Dec 2007 03:45:36 +0000 Subject: * parse.y (expr): 'not' and '!' should act as conditional expression. [ruby-dev:32548] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ parse.y | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea44ddb90..0b2581d06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 12 12:44:39 2007 Yukihiro Matsumoto + + * parse.y (expr): 'not' and '!' should act as conditional + expression. [ruby-dev:32548] + Wed Dec 12 12:11:42 2007 Nobuyoshi Nakada * re.c (rb_reg_regsub): should copy encoding. diff --git a/parse.y b/parse.y index 2f3a118d1..a57a0f407 100644 --- a/parse.y +++ b/parse.y @@ -1148,7 +1148,7 @@ expr : command_call | keyword_not expr { /*%%%*/ - $$ = call_uni_op($2, '!'); + $$ = call_uni_op(cond($2), '!'); /*% $$ = dispatch2(unary, ripper_intern("not"), $2); %*/ @@ -1156,7 +1156,7 @@ expr : command_call | '!' command_call { /*%%%*/ - $$ = call_uni_op($2, '!'); + $$ = call_uni_op(cond($2), '!'); /*% $$ = dispatch2(unary, ripper_id2sym('!'), $2); %*/ @@ -2142,7 +2142,7 @@ arg : lhs '=' arg | '!' arg { /*%%%*/ - $$ = call_uni_op($2, '!'); + $$ = call_uni_op(cond($2), '!'); /*% $$ = dispatch2(unary, ID2SYM('!'), $2); %*/ -- cgit