From 042311d0c3aa1762038625c199d0be07b3a0f722 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Thu, 2 Aug 2012 18:52:16 +0200
Subject: [PATCH] lexical #1/3, move append(NULL) invokations into position

---
 src/frontend/parser/lexical.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/frontend/parser/lexical.c b/src/frontend/parser/lexical.c
index 937f93179..bb43e4785 100644
--- a/src/frontend/parser/lexical.c
+++ b/src/frontend/parser/lexical.c
@@ -240,7 +240,6 @@ gotchar:
 
 	case '\004':
 	case EOF:
-            append(NULL);
             if (cp_interactive && !cp_nocc && 
                     (string == NULL)) {
                 if (j == 0) {
@@ -253,9 +252,11 @@ gotchar:
                         fputs("quit\n", stdout);
                         cp_doquit();
                     }
+                    append(NULL);
                     goto done;
                 }
                 // cp_ccom doesn't mess wlist, read only access to wlist->wl_word
+                append(NULL);
                 cp_ccom(wlist, buf, FALSE);
                 wl_free(wlist);
                 (void) fputc('\r', cp_out);
@@ -273,9 +274,12 @@ gotchar:
                 if (cp_interactive) {
                     fputs("quit\n", stdout);
                     cp_doquit();
+                    append(NULL);
                     goto done;
-                } else
-                    return (NULL);
+                }
+
+                append(NULL);
+                return (NULL);
             }
 	case ESCAPE:
             if (cp_interactive && !cp_nocc) {