X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=a709d99351ca1b22486e77550cd51c2ce0dcb40f;hb=2be9bee9da6a2ce27715e58128569594319abfa2;hp=14677adad8b1813dabd45370386f5186db89c838;hpb=fe78c02ffbbf5e26593b48e47600c4ca86af681c;p=pspp-builds.git diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 14677ada..a709d993 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -1,269 +1,247 @@ -/* 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, 2010, 2011 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 "data/dataset.h" +#include "data/dictionary.h" +#include "data/file-handle-def.h" +#include "data/file-name.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/message-item.h" +#include "ui/debugger.h" +#include "ui/source-init-opts.h" +#include "ui/terminal/terminal-opts.h" +#include "ui/terminal/terminal-reader.h" +#include "ui/terminal/terminal.h" + +#include "gl/fatal-signal.h" +#include "gl/progname.h" +#include "gl/relocatable.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#include +static struct dataset *the_dataset; -static void i18n_init (void); +static void add_syntax_reader (struct lexer *, const char *file_name, + const char *encoding, enum lex_syntax_mode); +static void bug_handler(int sig); 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 void output_msg (const struct msg *, void *); /* Program entry point. */ int main (int argc, char **argv) { + struct terminal_opts *terminal_opts; + struct argv_parser *parser; + enum lex_syntax_mode syntax_mode; + char *syntax_encoding; + bool process_statrc; + struct lexer *lexer; + + set_program_name (argv[0]); + + 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 (); - fn_init (); fh_init (); - getl_initialize (); - readln_initialize (); settings_init (); + terminal_check_size (); random_init (); - default_dict = dict_create (); + lexer = lex_create (); + the_dataset = create_dataset (); - if (parse_command_line (argc, argv)) - { - outp_read_devices (); - lex_init (); + 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); - for (;;) - { - int retval; + msg_set_handler (output_msg, lexer); + dataset_set_default_syntax_encoding (the_dataset, syntax_encoding); - err_check_count (); - - retval = execute_command (); - if (retval == CMD_EOF) - break; - if (retval != CMD_SUCCESS) - handle_error (retval); + /* Add syntax files to source stream. */ + if (process_statrc) + { + char *rc = include_path_search ("rc"); + if (rc != NULL) + { + add_syntax_reader (lexer, rc, "Auto", LEX_SYNTAX_AUTO); + free (rc); } } - - terminate (err_error_count == 0); -} - -/* 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 ()) + if (optind < argc) { - msg (SW, _("This command not executed. Stopping here " - "to avoid cascading failures.")); - getl_abort_noninteractive (); - return; + int i; + + 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); - switch (code) + /* Parse and execute syntax. */ + lex_get (lexer); + for (;;) { - 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; + int result = cmd_parse (lexer, the_dataset); - case CMD_TRAILING_GARBAGE: - msg (SW, _("Trailing garbage was encountered following " - "this command. The command was fully executed " - "to this point.")); - break; + if (result == CMD_EOF || result == CMD_FINISH) + break; + else if (cmd_result_is_failure (result) && lex_token (lexer) != T_STOP) + { + 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_INTERACTIVE) + { + msg (SE, _("Stopping syntax file processing here to avoid " + "a cascade of dependent command failures.")); + lex_discard_noninteractive (lexer); + } + } - default: - abort (); + if (msg_ui_too_many_errors ()) + lex_discard_noninteractive (lexer); } - 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 (); - } + + destroy_dataset (the_dataset); + + random_done (); + settings_done (); + fh_done (); + lex_destroy (lexer); + output_close (); + 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); + +#if DEBUGGING + connect_debugger (); +#endif + switch (sig) { + case SIGABRT: + 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(""); + 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_, void *lexer_) { - static bool terminating = false; - if (!terminating) + struct lexer *lexer = lexer_; + struct msg m = *m_; + + if (m.file_name == NULL) { - terminating = true; + m.file_name = CONST_CAST (char *, lex_get_file_name (lexer)); + m.first_line = lex_get_first_line_number (lexer, 0); + m.last_line = lex_get_last_line_number (lexer, 0); + } - msg_done (); - outp_done (); + message_item_submit (message_item_create (&m)); +} - cancel_transformations (); - dict_destroy (default_dict); +static void +add_syntax_reader (struct lexer *lexer, const char *file_name, + const char *encoding, enum lex_syntax_mode syntax_mode) +{ + struct lex_reader *reader; - random_done (); - settings_done (); - fh_done (); - lex_done (); - getl_uninitialize (); - readln_uninitialize (); - } - exit (success ? EXIT_SUCCESS : EXIT_FAILURE); + 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); }