X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=9143220d3147accd05b935481909c22b1d6b1faa;hb=c427e8ca6b4c5d3d365b4ff3bb58a81e34efd217;hp=7560dcfe0d3d2b424e37d7efb37cf62f1775a108;hpb=b0bf9b1b0f727fafac4296a048e3f45db5936f81;p=pspp diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 7560dcfe0d..9143220d31 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -1,48 +1,47 @@ -/* 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 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 "msg-ui.h" #include "progname.h" -#include "procedure.h" #include "read-line.h" #include #include +#include #include +#include +#include #include #include #include #include #include -#include +#include #include #include #include #include #include -#include #if HAVE_FPU_CONTROL_H #include @@ -56,6 +55,10 @@ #include #endif +#if HAVE_IEEEFP_H +#include +#endif + #include "gettext.h" #define _(msgid) gettext (msgid) @@ -63,7 +66,6 @@ static void i18n_init (void); static void fpu_init (void); -static int execute_command (void); static void terminate (bool success) NO_RETURN; /* If a segfault happens, issue a message to that effect and halt */ @@ -71,76 +73,71 @@ 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 ; /* 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); - set_program_name ("pspp"); + set_program_name (argv[0]); + i18n_init (); fpu_init (); gsl_set_error_handler_off (); + fmt_init (); outp_init (); - msg_ui_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 (); random_init (); - proc_init (); - if (parse_command_line (argc, argv)) + the_dataset = create_dataset (NULL, NULL); + + if (parse_command_line (argc, argv, the_source_stream)) { + msg_ui_init (the_source_stream); outp_read_devices (); - lex_init (); + the_lexer = lex_create (the_source_stream); for (;;) { - int result = execute_command (); + int result = cmd_parse (the_lexer, the_dataset); + if (result == CMD_EOF || result == CMD_FINISH) break; - if (result == CMD_CASCADING_FAILURE && !getl_is_interactive ()) + 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 (); + getl_abort_noninteractive (the_source_stream); } else - check_msg_count (); + check_msg_count (the_source_stream); } } - - terminate (!any_errors ()); -} -/* Parses a command and returns the result. */ -static int -execute_command (void) -{ - /* 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); - return cmd_parse (proc_has_source () - ? CMD_STATE_DATA : CMD_STATE_INITIAL); + terminate (!any_errors ()); } static void -i18n_init (void) +i18n_init (void) { #if ENABLE_NLS #if HAVE_LC_MESSAGES @@ -153,35 +150,39 @@ i18n_init (void) } 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 +void interrupt_handler(int sig UNUSED) { terminate (false); @@ -194,21 +195,23 @@ static void terminate (bool success) { static bool terminating = false; - if (!terminating) + if (!terminating) { terminating = true; - proc_done (); + 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 (); + fmt_done (); } exit (success ? EXIT_SUCCESS : EXIT_FAILURE); }