/* 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-2013 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
#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"
#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"
#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);
random_init ();
lexer = lex_create ();
- the_dataset = create_dataset ();
+ the_session = session_create (NULL);
+ dataset_create (the_session, "");
parser = argv_parser_create ();
terminal_opts = terminal_opts_init (parser, &syntax_mode, &process_statrc,
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)
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;
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."));
}
- destroy_dataset (the_dataset);
+ session_destroy (the_session);
random_done ();
settings_done ();
recurse. */
signal (sig, SIG_DFL);
-#if DEBUGGING
- connect_debugger ();
-#endif
switch (sig)
{
case SIGABRT: