From c079210c9e741c1f5b05148dec72c77bcbaa1f50 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 25 Jun 2008 12:55:47 +0000 Subject: * parse.y (primary): make functional-style not operator to act like function. see . git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ keywords | 2 +- lex.c.blt | 9 ++++++--- lex.c.src | 2 +- parse.y | 8 ++++++++ 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a6c438658..97b5744a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 25 21:54:34 2008 Yukihiro Matsumoto + + * parse.y (primary): make functional-style not operator to act + like function. see . + Wed Jun 25 15:28:50 2008 Nobuyoshi Nakada * array.c (rb_ary_fill): not depend on unspecified behavior at integer diff --git a/keywords b/keywords index 504d5230b..f0d82a766 100644 --- a/keywords +++ b/keywords @@ -31,7 +31,7 @@ in, {keyword_in, keyword_in}, EXPR_VALUE module, {keyword_module, keyword_module}, EXPR_VALUE next, {keyword_next, keyword_next}, EXPR_MID nil, {keyword_nil, keyword_nil}, EXPR_END -not, {keyword_not, keyword_not}, EXPR_VALUE +not, {keyword_not, keyword_not}, EXPR_ARG or, {keyword_or, keyword_or}, EXPR_VALUE redo, {keyword_redo, keyword_redo}, EXPR_END rescue, {keyword_rescue, modifier_rescue}, EXPR_MID diff --git a/lex.c.blt b/lex.c.blt index 7bf3a8264..ea2068664 100644 --- a/lex.c.blt +++ b/lex.c.blt @@ -1,5 +1,5 @@ -/* C code produced by gperf version 3.0.2 */ -/* Command-line: gperf --output-file=lex.c.tmp -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' keywords */ +/* C code produced by gperf version 3.0.3 */ +/* Command-line: gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k'1,3,$' keywords */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ @@ -101,6 +101,9 @@ hash (str, len) #ifdef __GNUC__ __inline +#ifdef __GNUC_STDC_INLINE__ +__attribute__ ((__gnu_inline__)) +#endif #endif const struct kwtable * rb_reserved_word (str, len) @@ -123,7 +126,7 @@ rb_reserved_word (str, len) #line 42 "keywords" {"then", {keyword_then, keyword_then}, EXPR_BEG}, #line 34 "keywords" - {"not", {keyword_not, keyword_not}, EXPR_VALUE}, + {"not", {keyword_not, keyword_not}, EXPR_ARG}, #line 27 "keywords" {"false", {keyword_false, keyword_false}, EXPR_END}, #line 40 "keywords" diff --git a/lex.c.src b/lex.c.src index 504d5230b..f0d82a766 100644 --- a/lex.c.src +++ b/lex.c.src @@ -31,7 +31,7 @@ in, {keyword_in, keyword_in}, EXPR_VALUE module, {keyword_module, keyword_module}, EXPR_VALUE next, {keyword_next, keyword_next}, EXPR_MID nil, {keyword_nil, keyword_nil}, EXPR_END -not, {keyword_not, keyword_not}, EXPR_VALUE +not, {keyword_not, keyword_not}, EXPR_ARG or, {keyword_or, keyword_or}, EXPR_VALUE redo, {keyword_redo, keyword_redo}, EXPR_END rescue, {keyword_rescue, modifier_rescue}, EXPR_MID diff --git a/parse.y b/parse.y index 022d94741..2d82b7b61 100644 --- a/parse.y +++ b/parse.y @@ -2613,6 +2613,14 @@ primary : literal $$ = dispatch1(defined, $5); %*/ } + | keyword_not '(' expr rparen + { + /*%%%*/ + $$ = call_uni_op(cond($3), '!'); + /*% + $$ = dispatch2(unary, ripper_intern("not"), $3); + %*/ + } | operation brace_block { /*%%%*/ -- cgit