diff --git a/ChangeLog b/ChangeLog index b41840b81f..f9b317e600 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jun 30 11:38:51 2004 Elven + + * parse.y (primary): should not be NULL. [ruby-core:03098] + Wed Jun 30 02:53:24 2004 why the lucky stiff * ext/syck/rubyext.c (syck_emitter_new): set buffer after diff --git a/parse.y b/parse.y index 2cc199097f..9f01320a8d 100644 --- a/parse.y +++ b/parse.y @@ -1438,7 +1438,10 @@ primary : literal bodystmt kEND { - $$ = NEW_BEGIN($3); + if ($3 == NULL) + $$ = NEW_NIL(); + else + $$ = NEW_BEGIN($3); nd_set_line($$, $1); } | tLPAREN_ARG expr {lex_state = EXPR_ENDARG;} opt_nl ')'