X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=d2336472bfb98a0b19d6bc10a8f8864dc38788a6;hb=510cc9dd9baf3108ba55cfb7893384517c9930b4;hp=3450ac9d68d81b294a187ce8afe6d7dd445bcc3f;hpb=42489b63e0b4bec2e20c2f55c9791234f7b41764;p=pspp diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 3450ac9d68..d2336472bf 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -1,194 +1,257 @@ -/* 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-2000, 2006-2007, 2009-2014 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 "command-line.h" -#include "msg-ui.h" -#include "progname.h" -#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 #endif - -#if HAVE_LOCALE_H -#include -#endif - #if HAVE_FENV_H #include #endif +#if HAVE_IEEEFP_H +#include +#endif +#include + +#include "data/dataset.h" +#include "data/dictionary.h" +#include "data/file-handle-def.h" +#include "data/session.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/lexer/include-path.h" +#include "libpspp/argv-parser.h" +#include "libpspp/compiler.h" +#include "libpspp/i18n.h" +#include "libpspp/message.h" +#include "libpspp/version.h" +#include "math/random.h" +#include "output/driver.h" +#include "output/output-item.h" +#include "ui/source-init-opts.h" +#include "ui/terminal/terminal-opts.h" +#include "ui/terminal/terminal-reader.h" + +#include "gl/fatal-signal.h" +#include "gl/progname.h" +#include "gl/relocatable.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#include +static struct session *the_session; -static void i18n_init (void); +static void add_syntax_reader (struct lexer *, const char *file_name, + const char *encoding, enum segmenter_mode); +static void bug_handler(int sig); static void fpu_init (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 void output_msg (const struct msg *, struct lexer *); /* Program entry point. */ int main (int argc, char **argv) { + struct terminal_opts *terminal_opts; + struct argv_parser *parser; + enum segmenter_mode syntax_mode; + char *syntax_encoding; + bool process_statrc; + struct lexer *lexer; + + set_program_name (argv[0]); + + prepare_fatal_error_message (); + prepare_diagnostic_information (); + signal (SIGABRT, bug_handler); signal (SIGSEGV, bug_handler); signal (SIGFPE, bug_handler); - signal (SIGINT, interrupt_handler); - set_program_name ("pspp"); i18n_init (); fpu_init (); gsl_set_error_handler_off (); - outp_init (); - msg_ui_init (); - fn_init (); + output_engine_push (); fh_init (); - getl_initialize (); - readln_initialize (); settings_init (); random_init (); - current_dataset = create_dataset (); - if (parse_command_line (argc, argv)) + lexer = lex_create (); + the_session = session_create (NULL); + dataset_create (the_session, ""); + + parser = argv_parser_create (); + terminal_opts = terminal_opts_init (parser, &syntax_mode, &process_statrc, + &syntax_encoding); + source_init_register_argv_parser (parser); + if (!argv_parser_run (parser, argc, argv)) + exit (EXIT_FAILURE); + terminal_opts_done (terminal_opts, argc, argv); + argv_parser_destroy (parser); + + lex_set_message_handler (lexer, output_msg); + session_set_default_syntax_encoding (the_session, syntax_encoding); + + /* Add syntax files to source stream. */ + if (process_statrc) { - outp_read_devices (); - lex_init (); + char *rc = include_path_search ("rc"); + if (rc != NULL) + { + add_syntax_reader (lexer, rc, "Auto", SEG_MODE_AUTO); + free (rc); + } + } + if (optind < argc) + { + int i; - for (;;) + for (i = optind; i < argc; i++) + add_syntax_reader (lexer, argv[i], syntax_encoding, syntax_mode); + } + else + add_syntax_reader (lexer, "-", syntax_encoding, syntax_mode); + + /* Parse and execute syntax. */ + lex_get (lexer); + for (;;) + { + int result = cmd_parse (lexer, session_active_dataset (the_session)); + + if (result == CMD_EOF || result == CMD_FINISH) + break; + else if (cmd_result_is_failure (result) && lex_token (lexer) != T_STOP) { - int result = cmd_parse (proc_has_source (current_dataset) - ? CMD_STATE_DATA : CMD_STATE_INITIAL); - if (result == CMD_EOF || result == CMD_FINISH) - break; - if (result == CMD_CASCADING_FAILURE && !getl_is_interactive ()) + if (lex_get_error_mode (lexer) == LEX_ERROR_STOP) + { + msg (MW, _("Error encountered while ERROR=STOP is effective.")); + lex_discard_noninteractive (lexer); + } + else if (result == CMD_CASCADING_FAILURE + && lex_get_error_mode (lexer) != LEX_ERROR_TERMINAL) { msg (SE, _("Stopping syntax file processing here to avoid " "a cascade of dependent command failures.")); - getl_abort_noninteractive (); + lex_discard_noninteractive (lexer); } - else - check_msg_count (); } + + if (msg_ui_too_many_errors ()) + lex_discard_noninteractive (lexer); } - - terminate (!any_errors ()); + + + output_engine_pop (); + session_destroy (the_session); + + random_done (); + settings_done (); + fh_done (); + lex_destroy (lexer); + i18n_done (); + + return msg_ui_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 +static void bug_handler(int sig) { - switch (sig) + /* Reset SIG to its default handling so that if it happens again we won't + recurse. */ + signal (sig, SIG_DFL); + + switch (sig) { case SIGABRT: - request_bug_report_and_abort("Assertion Failure/Abort"); + request_bug_report("Assertion Failure/Abort"); + break; case SIGFPE: - request_bug_report_and_abort("Floating Point Exception"); + request_bug_report("Floating Point Exception"); + break; case SIGSEGV: - request_bug_report_and_abort("Segmentation Violation"); + request_bug_report("Segmentation Violation"); + break; default: - request_bug_report_and_abort("Unknown"); + request_bug_report("Unknown"); + break; } -} -void -interrupt_handler(int sig UNUSED) -{ - terminate (false); + /* Re-raise the signal so that we terminate with the correct status. */ + raise (sig); } - -/* Terminate PSPP. SUCCESS should be true to exit successfully, - false to exit as a failure. */ static void -terminate (bool success) +output_msg (const struct msg *m_, struct lexer *lexer) { - static bool terminating = false; - if (!terminating) + struct msg_location *location = m_->location; + if (!location && lexer) { - terminating = true; + location = lex_get_location (lexer, 0, 0); + msg_location_remove_columns (location); + } - destroy_dataset (current_dataset); + struct msg m = { + .category = m_->category, + .severity = m_->severity, + .stack = m_->stack, + .n_stack = m_->n_stack, + .location = location, + .command_name = output_get_uppercase_command_name (), + .text = m_->text, + }; - random_done (); - settings_done (); - fh_done (); - lex_done (); - getl_uninitialize (); - readln_uninitialize (); + output_item_submit (message_item_create (&m)); - outp_done (); - msg_ui_done (); - } - exit (success ? EXIT_SUCCESS : EXIT_FAILURE); + free (m.command_name); + if (m.location != m_->location) + msg_location_destroy (m.location); +} + +static void +add_syntax_reader (struct lexer *lexer, const char *file_name, + const char *encoding, enum segmenter_mode syntax_mode) +{ + struct lex_reader *reader; + + reader = (!strcmp (file_name, "-") && isatty (STDIN_FILENO) + ? terminal_reader_create () + : lex_reader_for_file (file_name, encoding, syntax_mode, + LEX_ERROR_CONTINUE)); + + if (reader) + lex_append (lexer, reader); }