output: Make it possible to push and pop output engines.

[pspp] / src / ui / terminal / main.c

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 805681d9ecc37f83bc40d0c00024391c9be7002f..fdbca25a2f61f76fbb407e02cc5cf8bd069b0512 100644 (file)
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1997-2000, 2006-2007, 2009-2014 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
@@ -34,6 +34,7 @@
 #include "data/dictionary.h"
 #include "data/file-handle-def.h"
 #include "data/file-name.h"
+#include "data/session.h"
 #include "data/settings.h"
 #include "data/variable.h"
 #include "gsl/gsl_errno.h"
@@ -48,7 +49,6 @@
 #include "math/random.h"
 #include "output/driver.h"
 #include "output/message-item.h"
-#include "ui/debugger.h"
 #include "ui/source-init-opts.h"
 #include "ui/terminal/terminal-opts.h"
 #include "ui/terminal/terminal-reader.h"
@@ -61,7 +61,7 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-static struct dataset *the_dataset;
+static struct session *the_session;
 
 static void add_syntax_reader (struct lexer *, const char *file_name,
                                const char *encoding, enum lex_syntax_mode);
@@ -90,13 +90,15 @@ main (int argc, char **argv)
   fpu_init ();
   gsl_set_error_handler_off ();
 
+  output_engine_push ();
   fh_init ();
   settings_init ();
   terminal_check_size ();
   random_init ();
 
   lexer = lex_create ();
-  the_dataset = dataset_create ();
+  the_session = session_create (NULL);
+  dataset_create (the_session, "");
 
   parser = argv_parser_create ();
   terminal_opts = terminal_opts_init (parser, &syntax_mode, &process_statrc,
@@ -108,7 +110,7 @@ main (int argc, char **argv)
   argv_parser_destroy (parser);
 
   msg_set_handler (output_msg, lexer);
-  dataset_set_default_syntax_encoding (the_dataset, syntax_encoding);
+  session_set_default_syntax_encoding (the_session, syntax_encoding);
 
   /* Add syntax files to source stream. */
   if (process_statrc)
@@ -134,7 +136,7 @@ main (int argc, char **argv)
   lex_get (lexer);
   for (;;)
     {
-      int result = cmd_parse (lexer, the_dataset);
+      int result = cmd_parse (lexer, session_active_dataset (the_session));
 
       if (result == CMD_EOF || result == CMD_FINISH)
        break;
@@ -146,7 +148,7 @@ main (int argc, char **argv)
               lex_discard_noninteractive (lexer);
             }
           else if (result == CMD_CASCADING_FAILURE
-                   && lex_get_error_mode (lexer) != LEX_ERROR_INTERACTIVE)
+                   && lex_get_error_mode (lexer) != LEX_ERROR_TERMINAL)
             {
               msg (SE, _("Stopping syntax file processing here to avoid "
                          "a cascade of dependent command failures."));
@@ -159,13 +161,13 @@ main (int argc, char **argv)
     }
 
 
-  dataset_destroy (the_dataset);
+  session_destroy (the_session);
 
   random_done ();
   settings_done ();
   fh_done ();
   lex_destroy (lexer);
-  output_close ();
+  output_engine_pop ();
   i18n_done ();
 
   return msg_ui_any_errors ();
@@ -192,9 +194,6 @@ bug_handler(int sig)
      recurse. */
   signal (sig, SIG_DFL);
 
-#if DEBUGGING
-  connect_debugger ();
-#endif
   switch (sig)
     {
     case SIGABRT: