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 a0ba84d898c29e09fb4246485a3991cc84b64dec..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
@@
-33,7
+33,6
@@
#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/file-handle-def.h"
#include "data/dataset.h"
#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 "data/session.h"
#include "data/settings.h"
#include "data/variable.h"
@@
-49,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"
@@
-91,13
+89,14
@@
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_session = session_create ();
+ the_session = session_create (
NULL
);
dataset_create (the_session, "");
parser = argv_parser_create ();
dataset_create (the_session, "");
parser = argv_parser_create ();
@@
-148,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."));
@@
-167,7
+166,7
@@
main (int argc, char **argv)
settings_done ();
fh_done ();
lex_destroy (lexer);
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 ();
@@
-194,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: