Implement journaling. Bug #17240.

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

diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c
index f62767ba915609c3a9dfc50fb058540958d6b83b..4e10ec22478caf8c8e3579d9e8b8094b0b31f688 100644 (file)
--- a/src/language/lexer/lexer.c
+++ b/src/language/lexer/lexer.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include "lexer.h"
@@ -33,6 +31,7 @@
 #include <data/settings.h>
 #include <libpspp/getl.h>
 #include <libpspp/str.h>
+#include <output/journal.h>
 
 #include "size_max.h"
 
@@ -858,8 +857,13 @@ bool
 lex_get_line_raw (struct lexer *lexer, enum getl_syntax *syntax)
 {
   enum getl_syntax dummy;
-  bool ok = getl_read_line (lexer->ss, &lexer->line_buffer,
-                              syntax != NULL ? syntax : &dummy);
+  bool ok;
+
+  if (syntax == NULL)
+    syntax = &dummy;
+  ok = getl_read_line (lexer->ss, &lexer->line_buffer, syntax);
+  journal_write (*syntax == GETL_BATCH, ds_cstr (&lexer->line_buffer));
+
   return ok;
 }
 
@@ -870,12 +874,12 @@ bool
 lex_get_line (struct lexer *lexer)
 {
   bool line_starts_command;
-  enum getl_syntax syntax;
+  enum getl_syntax syntax = GETL_BATCH;
 
   if (!lex_get_line_raw (lexer, &syntax))
     {
       lexer->prog = NULL;
-    return false;
+      return false;
     }
 
   lex_preprocess_line (&lexer->line_buffer, syntax,