From 098e796ec18e1488eabdfde1b34126be4de3d747 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 30 Jun 2004 02:39:38 +0000
Subject: * parse.y (primary): should not be NULL.  [ruby-core:03098]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 4 ++++
 parse.y   | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 20e360f8c..b92ab28e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 30 11:38:51 2004  Elven  <elven@elven.de>
+
+	* parse.y (primary): should not be NULL.  [ruby-core:03098]
+
 Wed Jun 30 02:41:10 2004  why the lucky stiff  <why@ruby-lang.org>
 
 	* ext/syck/rubyext.c (syck_emitter_new): set buffer after
diff --git a/parse.y b/parse.y
index ff8cc62e5..6a68ef2ca 100644
--- a/parse.y
+++ b/parse.y
@@ -1448,7 +1448,10 @@ primary		: literal
 		  bodystmt
 		  kEND
 		    {
-			$$ = NEW_BEGIN($3);
+			if ($3 == NULL)
+			    $$ = NEW_NIL();
+			else
+			    $$ = NEW_BEGIN($3);
 			nd_set_line($$, $<num>1);
 		    }
 		| tLPAREN_ARG expr {lex_state = EXPR_ENDARG;} rparen
-- 
cgit