#include "command-line.h"
#include "msg-ui.h"
#include "progname.h"
-#include "procedure.h"
#include "read-line.h"
#include <data/dictionary.h>
#include <data/file-handle-def.h>
#include <data/file-name.h>
+#include <data/procedure.h>
#include <data/settings.h>
#include <data/variable.h>
#include <gsl/gsl_errno.h>
#include <libpspp/version.h>
#include <math/random.h>
#include <output/output.h>
-#include <procedure.h>
#if HAVE_FPU_CONTROL_H
#include <fpu_control.h>
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 */
int
main (int argc, char **argv)
{
+ signal (SIGABRT, bug_handler);
signal (SIGSEGV, bug_handler);
signal (SIGFPE, bug_handler);
signal (SIGINT, interrupt_handler);
for (;;)
{
- int result = execute_command ();
+ int result = cmd_parse (proc_has_source ()
+ ? CMD_STATE_DATA : CMD_STATE_INITIAL);
if (result == CMD_EOF || result == CMD_FINISH)
break;
if (result == CMD_CASCADING_FAILURE && !getl_is_interactive ())
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);
-}
\f
static void
i18n_init (void)
{
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");
}
}