projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
categoricals: Improve comments.
[pspp]
/
src
/
ui
/
terminal
/
main.c
diff --git
a/src/ui/terminal/main.c
b/src/ui/terminal/main.c
index a9db6febe4a9db25e72244b206e51bf88e3db724..f7ec11520a95a573bf07a59088d545b373185dc0 100644
(file)
--- a/
src/ui/terminal/main.c
+++ b/
src/ui/terminal/main.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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
@@
-30,10
+30,10
@@
#endif
#include <unistd.h>
#endif
#include <unistd.h>
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/file-handle-def.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 "data/settings.h"
#include "data/variable.h"
#include "gsl/gsl_errno.h"
@@
-48,7
+48,6
@@
#include "math/random.h"
#include "output/driver.h"
#include "output/message-item.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 "ui/source-init-opts.h"
#include "ui/terminal/terminal-opts.h"
#include "ui/terminal/terminal-reader.h"
@@
-61,7
+60,7
@@
#include "gettext.h"
#define _(msgid) gettext (msgid)
#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);
static void add_syntax_reader (struct lexer *, const char *file_name,
const char *encoding, enum lex_syntax_mode);
@@
-90,13
+89,15
@@
main (int argc, char **argv)
fpu_init ();
gsl_set_error_handler_off ();
fpu_init ();
gsl_set_error_handler_off ();
+ output_engine_push ();
fh_init ();
settings_init ();
terminal_check_size ();
random_init ();
lexer = lex_create ();
fh_init ();
settings_init ();
terminal_check_size ();
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,
parser = argv_parser_create ();
terminal_opts = terminal_opts_init (parser, &syntax_mode, &process_statrc,
@@
-108,7
+109,7
@@
main (int argc, char **argv)
argv_parser_destroy (parser);
msg_set_handler (output_msg, lexer);
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)
/* Add syntax files to source stream. */
if (process_statrc)
@@
-134,7
+135,7
@@
main (int argc, char **argv)
lex_get (lexer);
for (;;)
{
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;
if (result == CMD_EOF || result == CMD_FINISH)
break;
@@
-146,7
+147,7
@@
main (int argc, char **argv)
lex_discard_noninteractive (lexer);
}
else if (result == CMD_CASCADING_FAILURE
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."));
{
msg (SE, _("Stopping syntax file processing here to avoid "
"a cascade of dependent command failures."));
@@
-159,13
+160,13
@@
main (int argc, char **argv)
}
}
-
destroy_dataset (the_dataset
);
+
session_destroy (the_session
);
random_done ();
settings_done ();
fh_done ();
lex_destroy (lexer);
random_done ();
settings_done ();
fh_done ();
lex_destroy (lexer);
- output_
close
();
+ output_
engine_pop
();
i18n_done ();
return msg_ui_any_errors ();
i18n_done ();
return msg_ui_any_errors ();
@@
-192,9
+193,6
@@
bug_handler(int sig)
recurse. */
signal (sig, SIG_DFL);
recurse. */
signal (sig, SIG_DFL);
-#if DEBUGGING
- connect_debugger ();
-#endif
switch (sig)
{
case SIGABRT:
switch (sig)
{
case SIGABRT: