2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index cd9efc32e4..469b909f5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 20 14:50:17 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* parse.y [ripper]: delayed heredocument events should be
+	  dispatched after EOF.
+
 Mon Sep 20 14:39:42 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* parse.y [ripper]: adjust lineno and columns for multi-line
diff --git a/parse.y b/parse.y
index 214a0f2914..d61ad5f136 100644
--- a/parse.y
+++ b/parse.y
@@ -6445,11 +6445,10 @@ yylex(p)
     t = parser_yylex(parser);
 #ifdef RIPPER
     parser->current_t = 0;
-    if (t != 0) {
+    if (t != 0)
 	ripper_dispatch_scan_event(parser, t);
-	if (t == '\n' && !parser->in_heredoc)
-	    ripper_dispatch_delayed_events(parser);
-    }
+    if ((t == '\n' && !parser->in_heredoc) || (t == 0))
+        ripper_dispatch_delayed_events(parser);
 #endif
 
     return t;