Remove various duplicated #include directives

[pspp-builds.git] / src / language / lexer / lexer.c

diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c
index aa681c80306b65f0cfb7f2c72f3edfae479ccead..8d0352ae8ab88ad0c3cf309d765c2b56fe01ae7e 100644 (file)
--- a/src/language/lexer/lexer.c
+++ b/src/language/lexer/lexer.c
@@ -15,8 +15,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+
 #include "lexer.h"
-#include <libpspp/message.h>
 #include <c-ctype.h>
 #include <c-strtod.h>
 #include <errno.h>
@@ -25,11 +25,11 @@
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <libpspp/assertion.h>
 #include <language/command.h>
-#include <libpspp/message.h>
 #include <data/settings.h>
+#include <libpspp/assertion.h>
 #include <libpspp/getl.h>
+#include <libpspp/message.h>
 #include <libpspp/str.h>
 #include <output/journal.h>
 #include <output/text-item.h>
@@ -862,6 +862,8 @@ lex_get_line_raw (struct lexer *lexer)
       const char *line = ds_cstr (&lexer->line_buffer);
       text_item_submit (text_item_create (TEXT_ITEM_SYNTAX, line));
     }
+  else
+    lexer->prog = NULL;
   return ok;
 }
 
@@ -874,10 +876,7 @@ lex_get_line (struct lexer *lexer)
   bool line_starts_command;
 
   if (!lex_get_line_raw (lexer))
-    {
-      lexer->prog = NULL;
-      return false;
-    }
+    return false;
 
   lex_preprocess_line (&lexer->line_buffer,
                       lex_current_syntax_mode (lexer),