X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=6998f773d9fb12ddbf7f7250e581a515746a46bf;hb=8acca2de53c1852f38726f70fc6516b34732a79f;hp=84cd2a6d562253432735c453b0aed506f36e9a10;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 84cd2a6d56..6998f773d9 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -1,5 +1,5 @@ /* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. Written by Ben Pfaff . This program is free software; you can redistribute it and/or @@ -18,25 +18,31 @@ 02110-1301, USA. */ #include -#include + #include #include + #include "command-line.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "msg-ui.h" #include "progname.h" -#include #include "read-line.h" + +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include #include +#include +#include #if HAVE_FPU_CONTROL_H #include @@ -55,25 +61,24 @@ #include -#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; /* 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; + -void terminate (bool success); /* Program entry point. */ int main (int argc, char **argv) { + signal (SIGABRT, bug_handler); signal (SIGSEGV, bug_handler); signal (SIGFPE, bug_handler); signal (SIGINT, interrupt_handler); @@ -83,117 +88,41 @@ main (int argc, char **argv) fpu_init (); gsl_set_error_handler_off (); + fmt_init (); outp_init (); + msg_ui_init (); fn_init (); fh_init (); getl_initialize (); readln_initialize (); settings_init (); random_init (); - - default_dict = dict_create (); + the_dataset = create_dataset (); if (parse_command_line (argc, argv)) { outp_read_devices (); - lex_init (); + lex_init (do_read_line); for (;;) { - int retval; - - err_check_count (); - - retval = execute_command (); - if (retval == CMD_EOF) + int result = cmd_parse (the_dataset, + proc_has_source (the_dataset) + ? CMD_STATE_DATA : CMD_STATE_INITIAL); + if (result == CMD_EOF || result == CMD_FINISH) break; - if (retval != CMD_SUCCESS) - handle_error (retval); + if (result == CMD_CASCADING_FAILURE && !getl_is_interactive ()) + { + msg (SE, _("Stopping syntax file processing here to avoid " + "a cascade of dependent command failures.")); + getl_abort_noninteractive (); + } + else + check_msg_count (); } } - terminate (err_error_count == 0); - abort (); -} - -/* 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; -} - -/* 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; - } - - 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; - - default: - abort (); - } - - if (!getl_is_interactive ()) - { - while (token != T_STOP && token != '.') - lex_get (); - } - else - { - msg (SW, _("The rest of this command has been discarded.")); - lex_discard_line (); - } + terminate (!any_errors ()); } static void @@ -226,15 +155,14 @@ bug_handler(int sig) { 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"); } } @@ -247,25 +175,25 @@ interrupt_handler(int sig UNUSED) /* Terminate PSPP. SUCCESS should be true to exit successfully, false to exit as a failure. */ -void +static void terminate (bool success) { static bool terminating = false; - if (terminating) - return; - terminating = true; - - err_done (); - outp_done (); + if (!terminating) + { + terminating = true; - cancel_transformations (); - dict_destroy (default_dict); + destroy_dataset (the_dataset); - random_done (); - settings_done (); - fh_done (); - lex_done (); - getl_uninitialize (); + random_done (); + settings_done (); + fh_done (); + lex_done (); + getl_uninitialize (); + readln_uninitialize (); + outp_done (); + msg_ui_done (); + } exit (success ? EXIT_SUCCESS : EXIT_FAILURE); }