From 25b242bfb60ec048ba19bfdaffdae8f7a58dfa09 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 9 Jan 2001 07:26:21 +0000 Subject: * enum.c (enum_inject): new method. * gc.c (rb_gc_call_finalizer_at_exit): clear klass member of terminating object. * eval.c (rb_call): raise exception for terminated object. * bignum.c (bigdivrem): t2 might be too big for signed long; do not use rb_int2big(), but rb_uint2big(). * error.c (rb_load_fail): new func to report LoadError. * ruby.c (load_file): use rb_load_fail. * eval.c (ruby_finalize): should enclosed by PUSH_TAG/POP_TAG. * gc.c (rb_gc_mark): link 2 of NODE_IFUNC should not be explicitly marked. it may contain non object pointer. * re.c (reg_s_last_match): Regexp::last_match(nth) returns nth substring of the match (alternative for $& and $). * eval.c (rb_mod_define_method): wrong comparison for blocks. * gc.c (id2ref): should handle Symbol too. * gc.c (id2ref): should print original ptr value * eval.c (rb_iterate): NODE_CFUNC does not protect its data (nd_tval), so create new node NODE_IFUNC for iteration C function. * eval.c (rb_yield_0): use NODE_IFUNC. * gc.c (rb_gc_mark): support NODE_IFUNC. * gc.c (mem_error): prohibit recursive mem_error(). (ruby-bugs-ja:PR#36) * eval.c (rb_thread_fd_writable): should not switch context if rb_thread_critical is set. * eval.c (rb_thread_wait_fd): ditto. * eval.c (rb_thread_wait_for): ditto. * eval.c (rb_thread_select): ditto. * eval.c (rb_thread_join): join during critical section causes deadlock. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index 714981866..0f0db252f 100644 --- a/parse.y +++ b/parse.y @@ -938,7 +938,11 @@ opt_call_args : none call_args : command_call { $$ = NEW_LIST($1); - } + } /* + | args ',' + { + $$ = $1; + } */ | args ',' command_call { $$ = list_append($1, $3); @@ -952,11 +956,11 @@ call_args : command_call value_expr($4); $$ = arg_concat($1, $4); $$ = arg_blk_pass($$, $5); - } + } /* | assocs ',' { $$ = NEW_LIST(NEW_HASH($1)); - } + } */ | assocs opt_block_arg { $$ = NEW_LIST(NEW_HASH($1)); @@ -972,11 +976,11 @@ call_args : command_call { $$ = list_append($1, NEW_HASH($3)); $$ = arg_blk_pass($$, $4); - } + } /* | args ',' assocs ',' { $$ = list_append($1, NEW_HASH($3)); - } + } */ | args ',' assocs ',' tSTAR arg opt_block_arg { value_expr($6); @@ -1842,8 +1846,6 @@ none : /* none */ $$ = 0; } %% -#include -#include #include "regex.h" #include "util.h" -- cgit