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 15d5e46c1e17c3e3ae154b555d8735707c2f1dfa..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
@@
-28,7
+27,7
@@
#include "progname.h"
#include "read-line.h"
#include "progname.h"
#include "read-line.h"
-
+#include <data/fastfile-factory.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
#include <libpspp/getl.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
#include <libpspp/getl.h>
@@
-83,6
+82,7
@@
static struct source_stream *the_source_stream ;
int
main (int argc, char **argv)
{
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);
@@
-105,7
+105,10
@@
main (int argc, char **argv)
readln_initialize ();
settings_init ();
random_init ();
readln_initialize ();
settings_init ();
random_init ();
- the_dataset = create_dataset ();
+
+ factory = fastfile_factory_create ();
+
+ the_dataset = create_dataset (factory, NULL, NULL);
if (parse_command_line (argc, argv, the_source_stream))
{
if (parse_command_line (argc, argv, the_source_stream))
{
@@
-115,9
+118,8
@@
main (int argc, char **argv)
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_CASCADING_FAILURE &&
if (result == CMD_EOF || result == CMD_FINISH)
break;
if (result == CMD_CASCADING_FAILURE &&
@@
-131,7
+133,7
@@
main (int argc, char **argv)
check_msg_count (the_source_stream);
}
}
check_msg_count (the_source_stream);
}
}
-
+
terminate (!any_errors ());
}
\f
terminate (!any_errors ());
}
\f