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=7ad162fca6d40b746a0155d891d8e08784e2e4df;hpb=3bbb4370239deb29ebbf813d258aef6249e2a431;p=pspp diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 7ad162fca6..d2336472bf 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2007, 2009 Free Software Foundation, Inc. + 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 @@ -28,146 +28,151 @@ #if HAVE_IEEEFP_H #include #endif - - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "fatal-signal.h" -#include "progname.h" -#include "relocatable.h" +#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) +static struct session *the_session; +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 clean_up (void); - -/* 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; - -static struct lexer *the_lexer; -static struct source_stream *the_source_stream ; - -const char *argp_program_version = version; -const char *argp_program_bug_address = PACKAGE_BUGREPORT; +static void output_msg (const struct msg *, struct lexer *); /* Program entry point. */ int main (int argc, char **argv) { - int *view_width_p, *view_length_p; - struct command_line_processor *clp; + 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); - at_fatal_signal (clean_up); i18n_init (); fpu_init (); gsl_set_error_handler_off (); - outp_init (); - fn_init (); + output_engine_push (); fh_init (); - the_source_stream = - create_source_stream ( - fn_getenv_default ("STAT_INCLUDE_PATH", include_path) - ); - prompt_init (); - readln_initialize (); - terminal_init (&view_width_p, &view_length_p); - settings_init (view_width_p, view_length_p); + settings_init (); random_init (); - the_dataset = create_dataset (); + 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); - clp = command_line_processor_create (_("PSPP --- A program for statistical analysis"), - _("FILE1, FILE2 ... FILEn"), NULL); - - command_line_processor_add_options (clp, &io_argp, - _("Options affecting input and output locations:"), the_source_stream); - - command_line_processor_add_options (clp, &test_argp, - _("Diagnostic options:"), the_source_stream); - - command_line_processor_add_options (clp, &post_init_argp, - _("Options affecting syntax and behavior:"), the_source_stream); - - command_line_processor_parse (clp, argc, argv); - - msg_ui_init (the_source_stream); - - if (!settings_get_testing_mode ()) + /* Add syntax files to source stream. */ + if (process_statrc) { - outp_read_devices (); + char *rc = include_path_search ("rc"); + if (rc != NULL) + { + add_syntax_reader (lexer, rc, "Auto", SEG_MODE_AUTO); + free (rc); + } } - else + if (optind < argc) { - 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")); - } + int i; - the_lexer = lex_create (the_source_stream); + 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 (the_lexer, the_dataset); + int result = cmd_parse (lexer, session_active_dataset (the_session)); if (result == CMD_EOF || result == CMD_FINISH) break; - 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 (the_source_stream); - } - else - check_msg_count (the_source_stream); + 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_TERMINAL) + { + msg (SE, _("Stopping syntax file processing here to avoid " + "a cascade of dependent command failures.")); + lex_discard_noninteractive (lexer); + } + } + + if (msg_ui_too_many_errors ()) + lex_discard_noninteractive (lexer); } - clean_up (); - return 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 fpu_init (void) { @@ -182,45 +187,71 @@ fpu_init (void) } /* If a segfault happens, issue a message to that effect and halt */ -void +static void bug_handler(int sig) { -#if DEBUGGING - connect_debugger (); -#endif + /* 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; } + + /* Re-raise the signal so that we terminate with the correct status. */ + raise (sig); } -/* Clean up PSPP in preparation for termination. */ static void -clean_up (void) +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; - - destroy_dataset (the_dataset); - - random_done (); - settings_done (); - fh_done (); - lex_destroy (the_lexer); - destroy_source_stream (the_source_stream); - prompt_done (); - readln_uninitialize (); - outp_done (); - msg_ui_done (); - i18n_done (); + location = lex_get_location (lexer, 0, 0); + msg_location_remove_columns (location); } + + 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, + }; + + output_item_submit (message_item_create (&m)); + + 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); }