X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=66fedf04fd900d9c97427f023b7583ab334b1035;hb=d96e59d1c5f17bd3b4b3b757640851731fde3c78;hp=b52fd941098ad899717dab11b09b69a60ff0d5bf;hpb=f5574c6264163859a8eb94ab1e33bcc1b61fce5f;p=pspp-builds.git diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index b52fd941..66fedf04 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -1,27 +1,25 @@ -/* PSPP - computes sample statistics. +/* PSPP - a program for statistical analysis. 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 - 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" @@ -29,6 +27,7 @@ #include #include +#include #include #include #include @@ -37,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -56,6 +55,10 @@ #include #endif +#if HAVE_IEEEFP_H +#include +#endif + #include "gettext.h" #define _(msgid) gettext (msgid) @@ -72,6 +75,8 @@ void bug_handler(int sig); 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. */ @@ -83,7 +88,8 @@ main (int argc, char **argv) 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 (); @@ -92,41 +98,53 @@ 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 (); random_init (); + the_dataset = create_dataset (); - if (parse_command_line (argc, argv)) + if (parse_command_line (argc, argv, the_source_stream)) { - msg_ui_init (); - outp_read_devices (); - lex_init (do_read_line); + msg_ui_init (the_source_stream); + if (!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 (;;) { - int result = cmd_parse (the_dataset, - proc_has_source (the_dataset) - ? CMD_STATE_DATA : CMD_STATE_INITIAL); + 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 ()); } static void -i18n_init (void) +i18n_init (void) { #if ENABLE_NLS #if HAVE_LC_MESSAGES @@ -139,21 +157,26 @@ 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"); @@ -166,7 +189,7 @@ bug_handler(int sig) } } -void +void interrupt_handler(int sig UNUSED) { terminate (false); @@ -179,7 +202,7 @@ static void terminate (bool success) { static bool terminating = false; - if (!terminating) + if (!terminating) { terminating = true; @@ -188,12 +211,14 @@ terminate (bool success) 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); }