Merge "master" into "psppsheet" to obtain bug fixes from "master".

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

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index a9db6febe4a9db25e72244b206e51bf88e3db724..a0ba84d898c29e09fb4246485a3991cc84b64dec 100644 (file)
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -30,10 +30,11 @@
 #endif
 #include <unistd.h>
 
+#include "data/dataset.h"
 #include "data/dictionary.h"
 #include "data/file-handle-def.h"
 #include "data/file-name.h"
-#include "data/procedure.h"
+#include "data/session.h"
 #include "data/settings.h"
 #include "data/variable.h"
 #include "gsl/gsl_errno.h"
@@ -61,7 +62,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);
@@ -96,7 +97,8 @@ main (int argc, char **argv)
   random_init ();
 
   lexer = lex_create ();
-  the_dataset = create_dataset ();
+  the_session = session_create ();
+  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;
@@ -159,7 +161,7 @@ main (int argc, char **argv)
     }
 
 
-  destroy_dataset (the_dataset);
+  session_destroy (the_session);
 
   random_done ();
   settings_done ();