X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=3f4139b85d377dc8b5dc3254a5c0d5e4a166df2f;hb=refs%2Fbuilds%2F20130203032041%2Fpspp;hp=a709d99351ca1b22486e77550cd51c2ce0dcb40f;hpb=2be9bee9da6a2ce27715e58128569594319abfa2;p=pspp diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index a709d99351..3f4139b85d 100644 --- 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-2012 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); @@ -96,7 +96,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 +109,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 +135,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 +160,7 @@ main (int argc, char **argv) } - destroy_dataset (the_dataset); + session_destroy (the_session); random_done (); settings_done (); @@ -192,9 +193,6 @@ bug_handler(int sig) recurse. */ signal (sig, SIG_DFL); -#if DEBUGGING - connect_debugger (); -#endif switch (sig) { case SIGABRT: