From ffe1cf575ecd5f9215a75728947520e9e668fb8a Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 2 Jul 2001 08:46:28 +0000 Subject: * error.c (exc_exception): clone the receiver exception instead of creating brand new exception object of the receiver. * eval.c (rb_eval_string_wrap): extend new ruby_top_self, not original self. * eval.c (rb_eval_cmd): respect ruby_wrapper if set. * eval.c (eval): do not update ruby_class unless scope is not provided. * eval.c (eval): preserve wrapper information. * eval.c (proc_invoke): ditto. * eval.c (block_pass): ditto. * parse.y (void_expr): too much warnings for void context (e.g. foo[1] that can be mere Proc call). * error.c (rb_name_error): new function to raise NameError with name attribute set. * eval.c (rb_f_missing): set name and args in the exception object. [new] * error.c (name_name): NameError#name - new method. * error.c (nometh_args): NoMethodError#args - new method. * lex.c (rb_reserved_word): lex_state after tRESCUE should be EXPR_MID. * gc.c (add_heap): allocation size of the heap unit is doubled for each allocation. * dir.c (isdelim): space, tab, and newline are no longer delimiters for glob patterns. * eval.c (svalue_to_avalue): new conversion scheme between single value and array values. * eval.c (avalue_to_svalue): ditto. * eval.c (rb_eval): REXPAND now uses avalue_to_svalue(), return and yield too. * eval.c (rb_yield_0): use avalue_to_svalue(). * eval.c (proc_invoke): Proc#call gives avaules, whereas Proc#yield gives mvalues. * eval.c (bmcall): convert given value (svalue) to avalue. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index 4a30d345cd..dcad8436fb 100644 --- a/parse.y +++ b/parse.y @@ -99,7 +99,6 @@ static int in_single = 0; static int in_def = 0; static int compile_for_eval = 0; static ID cur_mid = 0; -static ID last_id = 0; static NODE *cond(); static NODE *logop(); @@ -1091,16 +1090,16 @@ command_args : { } open_args : call_args - | tLPAREN_ARG {lex_state = EXPR_ENDARG;} ')' + | tLPAREN_ARG {lex_state = EXPR_ENDARG;} ')' { rb_warning("%s (...) interpreted as method call", - rb_id2name(last_id)); + rb_id2name($1)); $$ = 0; } | tLPAREN_ARG call_args2 {lex_state = EXPR_ENDARG;} ')' { rb_warning("%s (...) interpreted as method call", - rb_id2name(last_id)); + rb_id2name($1)); $$ = $2; } @@ -1192,7 +1191,7 @@ primary : literal } | tLPAREN_ARG expr {lex_state = EXPR_ENDARG;} ')' { - rb_warning("%s (...) interpreted as command call", rb_id2name(last_id)); + rb_warning("%s (...) interpreted as command call", rb_id2name($1)); $$ = $2; } | tLPAREN compstmt ')' @@ -2892,6 +2891,7 @@ double strtod (); static int yylex() { + static ID last_id = 0; register int c; int space_seen = 0; int cmd_state; @@ -3460,6 +3460,7 @@ yylex() else if (lex_state == EXPR_ARG) { rb_warning("%s (...) interpreted as method call", tok()); c = tLPAREN_ARG; + yylval.id = last_id; } } COND_PUSH(0); @@ -4422,10 +4423,6 @@ void_expr(node) case tLEQ: case tEQ: case tNEQ: - case tAREF: - case tRSHFT: - case tCOLON2: - case tCOLON3: useless = rb_id2name(node->nd_mid); break; } -- cgit v1.2.3