From 160055b47468d48dc0443bfbbeabf750bcfe8296 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 10 Aug 2005 01:39:24 +0000
Subject: * bignum.c (rb_big_mul0): multiply two numbers (x, y) without  
 normalizing the result.  x should be a big number.   [ruby-dev:26778]

* bignum.c (rb_big_pow): use rb_big_mul0() instead of
  rb_big_mul().

* array.c (rb_ary_or, rb_ary_and, rb_ary_plus, rb_ary_diff):
  revert the change on 2005-08-03.  Set operation on other item
  should have in separate methods.

* parse.y (shadowing_lvar_gen): warn when arguments shadows
  external local variables.

* parse.y (f_opt): optional arguments should not clobber external
  local variables.

* parse.y (f_rest_arg): rest arguments should not clobber external
  local variables.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8963 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 046ca4581a..94f2b38b6b 100644
--- a/parse.y
+++ b/parse.y
@@ -247,6 +247,8 @@ static NODE *call_op_gen _((struct parser_params*,NODE*,ID,int,NODE*));
 
 static NODE *new_args_gen _((struct parser_params*,VALUE,NODE*,NODE*,NODE*));
 #define new_args(f,o,r,b) new_args_gen(parser, f,o,r,b)
+static void shadowing_lvar_gen _((struct parser_params*,ID));
+#define shadowing_lvar(name) shadowing_lvar_gen(parser, name)
 
 static NODE *negate_lit _((NODE*));
 static NODE *ret_args _((NODE*));
@@ -4097,6 +4099,7 @@ f_norm_arg	: tCONSTANT
 			if (!is_local_id($1))
 			    yyerror("formal argument must be local variable");
 			if (dyna_in_block()) {
+		            shadowing_lvar($1);
 			    dyna_var($1);
 			}
 			else {
@@ -4110,7 +4113,9 @@ f_norm_arg	: tCONSTANT
 		;
 
 f_arg		: f_norm_arg
-		    { $$ = rb_ary_new3(1, ID2SYM($1)); }
+		    {
+		        $$ = rb_ary_new3(1, ID2SYM($1));
+		    }
 		| f_arg ',' f_norm_arg
 		    {
 			$$ = $1;
@@ -4126,7 +4131,11 @@ f_opt		: tIDENTIFIER '=' arg_value
 		    /*%%%*/
 			if (!is_local_id($1))
 			    yyerror("formal argument must be local variable");
-			$$ = assignable($1, $3);
+			if (dyna_in_block()) {
+		            shadowing_lvar($1);
+			    dyna_var($1);
+			}
+		        $$ = assignable($1, $3);
 		    /*%
 			$$ = rb_assoc_new($1, $3);
 		    %*/
@@ -4161,6 +4170,10 @@ f_rest_arg	: restarg_mark tIDENTIFIER
 		    /*%%%*/
 			if (!is_local_id($2))
 			    yyerror("rest argument must be local variable");
+			if (dyna_in_block()) {
+		            shadowing_lvar($2);
+			    dyna_var($2);
+			}
 			$$ = assignable($2, 0);
 		    /*%
 			$$ = dispatch1(restparam, $2);
@@ -7303,6 +7316,16 @@ assignable_gen(parser, id, val)
     return 0;
 }
 
+static void
+shadowing_lvar_gen(parser, name)
+    struct parser_params *parser;
+    ID name;
+{
+    if (rb_dvar_defined(name) || local_id(name)) {
+	rb_warningS("shadowing outer local variable - %s", rb_id2name(name));
+    }
+}
+
 static NODE*
 new_bv_gen(parser, name, val)
     struct parser_params *parser;
@@ -7314,9 +7337,7 @@ new_bv_gen(parser, name, val)
 		      rb_id2name(name));
 	return 0;
     }
-    if (rb_dvar_defined(name) || local_id(name)) {
-	rb_warningS("shadowing outer local variable - %s", rb_id2name(name));
-    }
+    shadowing_lvar(name);
     dyna_var(name);
     return NEW_DASGN_CURR(name, val);
 }
-- 
cgit v1.2.3