projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enables Data Open/Save/New menuitems.
[pspp-builds.git]
/
src
/
ui
/
terminal
/
main.c
diff --git
a/src/ui/terminal/main.c
b/src/ui/terminal/main.c
index 0613476b549f88027e431170b18b1c640a2bedac..2f7d1fbea7baada5b5aafd6d50ff09139518e78f 100644
(file)
--- a/
src/ui/terminal/main.c
+++ b/
src/ui/terminal/main.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-22,13
+21,16
@@
#include <signal.h>
#include <stdio.h>
#include <signal.h>
#include <stdio.h>
+#include <ui/debugger.h>
#include "command-line.h"
#include "msg-ui.h"
#include "progname.h"
#include "read-line.h"
#include "command-line.h"
#include "msg-ui.h"
#include "progname.h"
#include "read-line.h"
+#include <data/fastfile-factory.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
+#include <libpspp/getl.h>
#include <data/file-name.h>
#include <data/format.h>
#include <data/procedure.h>
#include <data/file-name.h>
#include <data/format.h>
#include <data/procedure.h>
@@
-37,7
+39,7
@@
#include <gsl/gsl_errno.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <gsl/gsl_errno.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
-#include <language/
line-buffer
.h>
+#include <language/
prompt
.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <libpspp/version.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <libpspp/version.h>
@@
-73,11
+75,14
@@
void interrupt_handler(int sig);
static struct dataset * the_dataset = NULL;
static struct lexer *the_lexer;
static struct dataset * the_dataset = NULL;
static struct lexer *the_lexer;
+static struct source_stream *the_source_stream ;
+
/* Program entry point. */
int
main (int argc, char **argv)
{
/* Program entry point. */
int
main (int argc, char **argv)
{
+ struct casefile_factory *factory;
signal (SIGABRT, bug_handler);
signal (SIGSEGV, bug_handler);
signal (SIGFPE, bug_handler);
signal (SIGABRT, bug_handler);
signal (SIGSEGV, bug_handler);
signal (SIGFPE, bug_handler);
@@
-92,36
+97,43
@@
main (int argc, char **argv)
outp_init ();
fn_init ();
fh_init ();
outp_init ();
fn_init ();
fh_init ();
- getl_initialize ();
+ the_source_stream =
+ create_source_stream (
+ fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
+ );
+ prompt_init ();
readln_initialize ();
settings_init ();
random_init ();
readln_initialize ();
settings_init ();
random_init ();
- the_dataset = create_dataset ();
- if (parse_command_line (argc, argv))
+ factory = fastfile_factory_create ();
+
+ the_dataset = create_dataset (factory, NULL, NULL);
+
+ if (parse_command_line (argc, argv, the_source_stream))
{
{
- msg_ui_init ();
+ msg_ui_init (
the_source_stream
);
outp_read_devices ();
outp_read_devices ();
- the_lexer = lex_create (
do_read_line
);
+ the_lexer = lex_create (
the_source_stream
);
for (;;)
{
for (;;)
{
- int result = cmd_parse (the_lexer, the_dataset,
- proc_has_source (the_dataset)
- ? CMD_STATE_DATA : CMD_STATE_INITIAL);
+ int result = cmd_parse (the_lexer, the_dataset);
+
if (result == CMD_EOF || result == CMD_FINISH)
break;
if (result == CMD_EOF || result == CMD_FINISH)
break;
- if (result == CMD_CASCADING_FAILURE && !getl_is_interactive ())
+ 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."));
{
msg (SE, _("Stopping syntax file processing here to avoid "
"a cascade of dependent command failures."));
- getl_abort_noninteractive ();
+ getl_abort_noninteractive (
the_source_stream
);
}
else
}
else
- check_msg_count ();
+ check_msg_count (
the_source_stream
);
}
}
}
}
-
+
terminate (!any_errors ());
}
\f
terminate (!any_errors ());
}
\f
@@
-153,6
+165,9
@@
fpu_init (void)
void
bug_handler(int sig)
{
void
bug_handler(int sig)
{
+#if DEBUGGING
+ connect_debugger ();
+#endif
switch (sig)
{
case SIGABRT:
switch (sig)
{
case SIGABRT:
@@
-189,11
+204,13
@@
terminate (bool success)
settings_done ();
fh_done ();
lex_destroy (the_lexer);
settings_done ();
fh_done ();
lex_destroy (the_lexer);
- getl_uninitialize ();
+ destroy_source_stream (the_source_stream);
+ prompt_done ();
readln_uninitialize ();
outp_done ();
msg_ui_done ();
readln_uninitialize ();
outp_done ();
msg_ui_done ();
+ fmt_done ();
}
exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
}
}
exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
}