projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed bug #11227 (T-Test not working with alpha independent variable )
[pspp-builds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 3b7687b2cede0bb7367d99dc3cc2d1153ac0d7bf..b4aa243518f7851e3adbf496ebe51059ef730a74 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-23,11
+23,14
@@
#include "main.h"
#include "cmdline.h"
#include "command.h"
#include "main.h"
#include "cmdline.h"
#include "command.h"
+#include "dictionary.h"
#include "error.h"
#include "getline.h"
#include "glob.h"
#include "lexer.h"
#include "output.h"
#include "error.h"
#include "getline.h"
#include "glob.h"
#include "lexer.h"
#include "output.h"
+#include "settings.h"
+#include "var.h"
#include <signal.h>
#include <stdlib.h>
#include <signal.h>
#include <stdlib.h>
@@
-55,13
+58,6
@@
void bug_handler(int sig);
we hit end-of-file unexpectedly (or whatever). */
int start_interactive;
we hit end-of-file unexpectedly (or whatever). */
int start_interactive;
-/* Initialise error handling on the gsl library */
-static void
-err_handler_gsl (const char *reason, const char *file,
- int line, int gsl_errno UNUSED)
-{
- msg(FE, _("gsl error at %s:%d; reason: \"%s\""), file,line,reason);
-}
/* Program entry point. */
int
/* Program entry point. */
int
@@
-69,7
+65,7
@@
main (int argc, char **argv)
{
signal (SIGSEGV, bug_handler);
{
signal (SIGSEGV, bug_handler);
- gsl_set_error_handler
(err_handler_gsl
);
+ gsl_set_error_handler
_off(
);
/* Initialization. */
if (!outp_init ())
/* Initialization. */
if (!outp_init ())
@@
-105,6
+101,8
@@
parse_script (void)
static int
execute_command (void)
{
static int
execute_command (void)
{
+ int result;
+
/* Read the command's first token.
We may hit end of file.
If so, give the line reader a chance to proceed to the next file.
/* Read the command's first token.
We may hit end of file.
If so, give the line reader a chance to proceed to the next file.
@@
-123,7
+121,15
@@
execute_command (void)
/* Parse the command. */
getl_prompt = GETL_PRPT_CONTINUATION;
/* Parse the command. */
getl_prompt = GETL_PRPT_CONTINUATION;
- return cmd_parse ();
+ 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
}
/* Print an error message corresponding to the command return code
@@
-166,8
+172,11
@@
handle_error (int code)
while (token != T_STOP && token != '.')
lex_get ();
}
while (token != T_STOP && token != '.')
lex_get ();
}
- else
- lex_discard_line ();
+ else
+ {
+ msg (SW, _("The rest of this command has been discarded."));
+ lex_discard_line ();
+ }
}
}