From ea1ca23ba1de9dd616fe26c0610e51744f454fd3 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 16 Mar 2005 09:25:45 +0000
Subject: * eval.c (rb_call0): reorganize "return" event post.

* eval.c (return_jump): no need to post "return" event here.

* object.c (str_to_id): raise ArgumentError for NUL containing
  strings.

* parse.y (primary): wrong var node was set for NODE_LAMBDA.
  [ruby-core:04555]

* re.c (make_regexp): need to free internal regexp structure when
  compilation fails.  [ruby-talk:133228]

* parse.y (bv_decl): remove initialize rule from block local
  variable declaration.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 parse.y | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 5c2237867..e91be7147 100644
--- a/parse.y
+++ b/parse.y
@@ -2538,7 +2538,10 @@ primary		: literal
 		  '}'
 		    {
 		    /*%%%*/
-			$$ = NEW_LAMBDA($3, dyna_init($5, $<vars>4));
+			$3->nd_body = block_append($3->nd_body,
+						   dyna_init($5, $<vars>4));
+			$$ = $3;
+		        nd_set_type($3, NODE_LAMBDA);
 			nd_set_line($$, $<num>1);
 			dyna_pop($<vars>2);
 		    /*%
@@ -3176,14 +3179,6 @@ bv_decl		:  tIDENTIFIER
 			$$ = FIXME;
 		    %*/
 		    }
-		| tIDENTIFIER '=' primary
-		    {
-		    /*%%%*/
-                        $$ = new_bv($1, $3);
-		    /*%
-			$$ = FIXME;
-		    %*/
-		    }
 		;
 
 do_block	: kDO_BLOCK
-- 
cgit