X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=af8f7f2dd4df9828361a1dccfdb54d09473875b9;hb=72b60ca723de25361c9aeaad607bae6c77bb6f1a;hp=14677adad8b1813dabd45370386f5186db89c838;hpb=fe78c02ffbbf5e26593b48e47600c4ca86af681c;p=pspp-builds.git diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 14677ada..af8f7f2d 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -1,82 +1,96 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 2006, 2007, 2009 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 the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include -#include + #include #include -#include "command-line.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "progname.h" -#include -#include "read-line.h" -#include -#include -#include - +#include #if HAVE_FPU_CONTROL_H #include #endif - -#if HAVE_LOCALE_H -#include -#endif - #if HAVE_FENV_H #include #endif +#if HAVE_IEEEFP_H +#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 + +#include "fatal-signal.h" +#include "progname.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#include -static void i18n_init (void); static void fpu_init (void); -static void handle_error (int code); -static int execute_command (void); -static void terminate (bool success) NO_RETURN; +static void clean_up (void); /* If a segfault happens, issue a message to that effect and halt */ void bug_handler(int sig); /* Handle quit/term/int signals */ void interrupt_handler(int sig); +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; + set_program_name (argv[0]); + + signal (SIGABRT, bug_handler); signal (SIGSEGV, bug_handler); signal (SIGFPE, bug_handler); - signal (SIGINT, interrupt_handler); + at_fatal_signal (clean_up); - set_program_name ("pspp"); i18n_init (); fpu_init (); gsl_set_error_handler_off (); @@ -84,186 +98,127 @@ main (int argc, char **argv) outp_init (); fn_init (); fh_init (); - getl_initialize (); + the_source_stream = + create_source_stream ( + fn_getenv_default ("STAT_INCLUDE_PATH", include_path) + ); + prompt_init (); readln_initialize (); - settings_init (); + terminal_init (&view_width_p, &view_length_p); + settings_init (view_width_p, view_length_p); random_init (); - default_dict = dict_create (); + the_dataset = create_dataset (); - if (parse_command_line (argc, argv)) - { - outp_read_devices (); - lex_init (); - for (;;) - { - int retval; - err_check_count (); + clp = command_line_processor_create (_("PSPP --- A program for statistical analysis"), + _("FILE1, FILE2 ... FILEn"), NULL); - retval = execute_command (); - if (retval == CMD_EOF) - break; - if (retval != CMD_SUCCESS) - handle_error (retval); - } - } - - terminate (err_error_count == 0); -} + command_line_processor_add_options (clp, &io_argp, + _("Options affecting input and output locations:"), the_source_stream); -/* Parse and execute a command, returning its return code. */ -static int -execute_command (void) -{ - int result; - - /* Read the command's first token. - The first token is part of the first line of the command. */ - getl_set_prompt_style (GETL_PROMPT_FIRST); - lex_get (); - if (token == T_STOP) - return CMD_EOF; - - /* Parse the command. - Any lines read after the first token must be continuation - lines. */ - getl_set_prompt_style (GETL_PROMPT_LATER); - result = cmd_parse (); - - /* Unset the /ALGORITHM subcommand if it was used */ - unset_cmd_algorithm (); - - /* Clear any auxiliary data from the dictionary. */ - dict_clear_aux (default_dict); - - return result; -} + command_line_processor_add_options (clp, &test_argp, + _("Diagnostic options:"), the_source_stream); -/* Print an error message corresponding to the command return code - CODE. */ -static void -handle_error (int code) -{ - if (code == CMD_CASCADING_FAILURE && !getl_is_interactive ()) - { - msg (SW, _("This command not executed. Stopping here " - "to avoid cascading failures.")); - getl_abort_noninteractive (); - return; - } + command_line_processor_add_options (clp, &post_init_argp, + _("Options affecting syntax and behavior:"), the_source_stream); - switch (code) - { - case CMD_FAILURE: - case CMD_CASCADING_FAILURE: - msg (SW, _("This command not executed.")); - break; - - case CMD_PART_SUCCESS_MAYBE: - msg (SW, _("Skipping the rest of this command. Part of " - "this command may have been executed.")); - break; - - case CMD_PART_SUCCESS: - msg (SW, _("Skipping the rest of this command. This " - "command was fully executed up to this point.")); - break; - - case CMD_TRAILING_GARBAGE: - msg (SW, _("Trailing garbage was encountered following " - "this command. The command was fully executed " - "to this point.")); - break; + command_line_processor_parse (clp, argc, argv); - default: - abort (); - } + msg_ui_init (the_source_stream); - if (!getl_is_interactive ()) + if (!settings_get_testing_mode ()) + { + outp_read_devices (); + } + else { - while (token != T_STOP && token != '.') - lex_get (); + 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")); } - else + + the_lexer = lex_create (the_source_stream); + + for (;;) { - msg (SW, _("The rest of this command has been discarded.")); - lex_discard_line (); + int result = cmd_parse (the_lexer, the_dataset); + + if (result == CMD_EOF || result == CMD_FINISH) + break; + if (result == CMD_CASCADING_FAILURE && + !getl_is_interactive (the_source_stream)) + { + msg (SE, _("Stopping syntax file processing here to avoid " + "a cascade of dependent command failures.")); + getl_abort_noninteractive (the_source_stream); + } + else + check_msg_count (the_source_stream); } + + + clean_up (); + return any_errors (); } static void -i18n_init (void) -{ -#if ENABLE_NLS -#if HAVE_LC_MESSAGES - setlocale (LC_MESSAGES, ""); -#endif - setlocale (LC_MONETARY, ""); - bindtextdomain (PACKAGE, locale_dir); - textdomain (PACKAGE); -#endif /* ENABLE_NLS */ -} - -static void -fpu_init (void) +fpu_init (void) { #if HAVE_FEHOLDEXCEPT fenv_t foo; feholdexcept (&foo); #elif HAVE___SETFPUCW && defined(_FPU_IEEE) __setfpucw (_FPU_IEEE); +#elif HAVE_FPSETMASK + fpsetmask (0); #endif } /* If a segfault happens, issue a message to that effect and halt */ -void +void bug_handler(int sig) { - switch (sig) +#if DEBUGGING + connect_debugger (); +#endif + switch (sig) { + case SIGABRT: + request_bug_report_and_abort("Assertion Failure/Abort"); case SIGFPE: request_bug_report_and_abort("Floating Point Exception"); - break; case SIGSEGV: request_bug_report_and_abort("Segmentation Violation"); - break; default: - request_bug_report_and_abort(""); - break; + request_bug_report_and_abort("Unknown"); } } -void -interrupt_handler(int sig UNUSED) -{ - terminate (false); -} - - -/* Terminate PSPP. SUCCESS should be true to exit successfully, - false to exit as a failure. */ +/* Clean up PSPP in preparation for termination. */ static void -terminate (bool success) +clean_up (void) { static bool terminating = false; - if (!terminating) + if (!terminating) { terminating = true; - msg_done (); - outp_done (); - - cancel_transformations (); - dict_destroy (default_dict); + destroy_dataset (the_dataset); random_done (); settings_done (); fh_done (); - lex_done (); - getl_uninitialize (); + lex_destroy (the_lexer); + destroy_source_stream (the_source_stream); + prompt_done (); readln_uninitialize (); + outp_done (); + msg_ui_done (); + i18n_done (); } - exit (success ? EXIT_SUCCESS : EXIT_FAILURE); }