Improve portability to NetBSD and Alpha.

[pspp-builds.git] / src / ui / terminal / main.c

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 5b4ad2d3ac54d6002dbb81c51678375298406d36..e2cd180d9d03a58506228333c0ed729d1af82876 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.
-   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
@@ -28,7 +27,7 @@
 #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>
@@ -59,6 +58,10 @@
 #include <fenv.h>
 #endif
 
+#if HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -76,11 +79,14 @@ void interrupt_handler(int sig);
 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)
 {
+  struct casefile_factory *factory;
   signal (SIGABRT, bug_handler);
   signal (SIGSEGV, bug_handler);
   signal (SIGFPE, bug_handler);
@@ -95,37 +101,43 @@ main (int argc, char **argv)
   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 ();
-  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 ();
-      the_lexer = lex_create (do_read_line);
+      the_lexer = lex_create (the_source_stream);
 
       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 && !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."));
-              getl_abort_noninteractive (); 
+              getl_abort_noninteractive (the_source_stream); 
             }
           else
-            check_msg_count ();
+            check_msg_count (the_source_stream);
         }
     }
-  
+
   terminate (!any_errors ());
 }
 \f
@@ -150,6 +162,8 @@ fpu_init (void)
   feholdexcept (&foo);
 #elif HAVE___SETFPUCW && defined(_FPU_IEEE)
   __setfpucw (_FPU_IEEE);
+#elif HAVE_FPSETMASK
+  fpsetmask (0);
 #endif
 }
 
@@ -196,7 +210,7 @@ terminate (bool success)
       settings_done ();
       fh_done ();
       lex_destroy (the_lexer);
-      getl_uninitialize ();
+      destroy_source_stream (the_source_stream);
       prompt_done ();
       readln_uninitialize ();