02110-1301, USA. */
#include <config.h>
-#include <gsl/gsl_errno.h>
-#include <signal.h>
-#include <stdio.h>
+
#include "command-line.h"
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
-#include "file-handle-def.h"
-#include "filename.h"
-#include "line-buffer.h"
-#include "lexer.h"
-#include "output.h"
+#include "msg-ui.h"
#include "progname.h"
-#include "random.h"
+#include "procedure.h"
#include "read-line.h"
-#include "settings.h"
-#include "variable.h"
-#include "version.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/line-buffer.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <libpspp/version.h>
+#include <math/random.h>
+#include <output/output.h>
+#include <signal.h>
+#include <stdio.h>
+
#if HAVE_FPU_CONTROL_H
#include <fpu_control.h>
#include <stdlib.h>
-#include "debug-print.h"
-
static void i18n_init (void);
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);
-void terminate (bool success);
/* Program entry point. */
int
gsl_set_error_handler_off ();
outp_init ();
+ msg_ui_init ();
fn_init ();
fh_init ();
getl_initialize ();
for (;;)
{
- int retval;
-
- err_check_count ();
-
- retval = execute_command ();
- if (retval == CMD_EOF)
+ int result = execute_command ();
+ if (result == CMD_EOF || result == CMD_FINISH)
break;
- if (retval != CMD_SUCCESS)
- handle_error (retval);
+ if (result == CMD_CASCADING_FAILURE && !getl_is_interactive ())
+ {
+ msg (SE, _("Stopping syntax file processing here to avoid "
+ "a cascade of dependent command failures."));
+ getl_abort_noninteractive ();
+ }
+ else
+ check_msg_count ();
}
}
- terminate (err_error_count == 0);
- abort ();
+ terminate (!any_errors ());
}
-/* Parse and execute a command, returning its return code. */
+/* Parses a command and returns the result. */
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);
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 ())
- {
- msg (SW, _("This command not executed. Stopping here "
- "to avoid cascading failures."));
- getl_abort_noninteractive ();
- return;
- }
-
- switch (code)
- {
- 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;
-
- case CMD_TRAILING_GARBAGE:
- msg (SW, _("Trailing garbage was encountered following "
- "this command. The command was fully executed "
- "to this point."));
- break;
-
- default:
- abort ();
- }
-
- 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 ();
- }
+ return cmd_parse (vfm_source != NULL ? CMD_STATE_DATA : CMD_STATE_INITIAL);
}
\f
static void
/* Terminate PSPP. SUCCESS should be true to exit successfully,
false to exit as a failure. */
-void
+static void
terminate (bool success)
{
static bool terminating = false;
- if (terminating)
- return;
- terminating = true;
-
- err_done ();
- outp_done ();
+ if (!terminating)
+ {
+ terminating = true;
- cancel_transformations ();
- dict_destroy (default_dict);
+ cancel_transformations ();
+ dict_destroy (default_dict);
- random_done ();
- settings_done ();
- fh_done ();
- lex_done ();
- getl_uninitialize ();
+ random_done ();
+ settings_done ();
+ fh_done ();
+ lex_done ();
+ getl_uninitialize ();
+ readln_uninitialize ();
+ outp_done ();
+ msg_ui_done ();
+ }
exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
}