X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=02be4f78c0e777f1e93df1719fc7fc0ed48f13f2;hb=f550aee00a62fe1d8baf62d83cd7efef6cc2ee92;hp=904c9a1dbc772bb1bcbf33d591124da8a41db9b6;hpb=c3ac5a8af9c449072c7e872ca70a78c1755ae309;p=pspp diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 904c9a1dbc..02be4f78c0 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 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010 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 @@ -16,7 +16,6 @@ #include -#include #include #include #include @@ -30,38 +29,39 @@ #include #endif -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "fatal-signal.h" -#include "progname.h" +#include "data/dictionary.h" +#include "data/file-handle-def.h" +#include "data/file-name.h" +#include "data/procedure.h" +#include "data/settings.h" +#include "data/variable.h" +#include "gsl/gsl_errno.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/prompt.h" +#include "libpspp/argv-parser.h" +#include "libpspp/compiler.h" +#include "libpspp/getl.h" +#include "libpspp/i18n.h" +#include "libpspp/message.h" +#include "libpspp/version.h" +#include "math/random.h" +#include "output/driver.h" +#include "ui/debugger.h" +#include "ui/source-init-opts.h" +#include "ui/terminal/msg-ui.h" +#include "ui/terminal/read-line.h" +#include "ui/terminal/terminal-opts.h" +#include "ui/terminal/terminal.h" + +#include "gl/fatal-signal.h" +#include "gl/progname.h" +#include "gl/relocatable.h" #include "gettext.h" #define _(msgid) gettext (msgid) -static void i18n_init (void); static void fpu_init (void); static void clean_up (void); @@ -75,34 +75,27 @@ static struct dataset * the_dataset = NULL; static struct lexer *the_lexer; static struct source_stream *the_source_stream ; -const char *argp_program_version = version; -const char *argp_program_bug_address = PACKAGE_BUGREPORT; - /* Program entry point. */ int main (int argc, char **argv) { int *view_width_p, *view_length_p; - struct command_line_processor *clp; + struct terminal_opts *terminal_opts; + struct argv_parser *parser; + set_program_name (argv[0]); signal (SIGABRT, bug_handler); signal (SIGSEGV, bug_handler); signal (SIGFPE, bug_handler); - signal (SIGALRM, SIG_IGN); at_fatal_signal (clean_up); i18n_init (); fpu_init (); gsl_set_error_handler_off (); - outp_init (); - fn_init (); fh_init (); - the_source_stream = - create_source_stream ( - fn_getenv_default ("STAT_INCLUDE_PATH", include_path) - ); + the_source_stream = create_source_stream (); prompt_init (); readln_initialize (); terminal_init (&view_width_p, &view_length_p); @@ -111,38 +104,16 @@ main (int argc, char **argv) the_dataset = create_dataset (); - - - clp = command_line_processor_create (_("PSPP --- A program for statistical analysis"), - _("FILE1, FILE2 ... FILEn"), NULL); - - command_line_processor_add_options (clp, &io_argp, - _("Options affecting input and output locations:"), the_source_stream); - - command_line_processor_add_options (clp, &test_argp, - _("Diagnositic options:"), the_source_stream); - - command_line_processor_add_options (clp, &post_init_argp, - _("Options affecting syntax and behavior:"), the_source_stream); - - command_line_processor_parse (clp, argc, argv); + parser = argv_parser_create (); + terminal_opts = terminal_opts_init (parser, the_source_stream); + source_init_register_argv_parser (parser, the_source_stream); + if (!argv_parser_run (parser, argc, argv)) + exit (EXIT_FAILURE); + terminal_opts_done (terminal_opts, argc, argv); + argv_parser_destroy (parser); msg_ui_init (the_source_stream); - if (!settings_get_testing_mode ()) - { - outp_read_devices (); - } - else - { - outp_configure_driver_line - ( - ss_cstr ("raw-ascii:ascii:listing:width=9999 length=9999 " - "output-file=\"pspp.list\" emphasis=none " - "headers=off paginate=off squeeze=on " - "top-margin=0 bottom-margin=0")); - } - the_lexer = lex_create (the_source_stream); for (;;) @@ -158,29 +129,15 @@ main (int argc, char **argv) "a cascade of dependent command failures.")); getl_abort_noninteractive (the_source_stream); } - else - check_msg_count (the_source_stream); + else if (msg_ui_too_many_errors ()) + getl_abort_noninteractive (the_source_stream); } clean_up (); - return any_errors (); + return msg_ui_any_errors (); } -static void -i18n_init (void) -{ -#if ENABLE_NLS -#if HAVE_LC_MESSAGES - setlocale (LC_MESSAGES, ""); -#endif -#if HAVE_LC_PAPER - setlocale (LC_PAPER, ""); -#endif - bindtextdomain (PACKAGE, locale_dir); - textdomain (PACKAGE); -#endif /* ENABLE_NLS */ -} static void fpu_init (void) @@ -233,7 +190,8 @@ clean_up (void) destroy_source_stream (the_source_stream); prompt_done (); readln_uninitialize (); - outp_done (); + output_close (); msg_ui_done (); + i18n_done (); } }