X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=b95ae2e3a2662675ec299c27d8f8f98dd6cbc6a5;hb=a1fa03b1638263a959df0b2943478a0a4ca4b11a;hp=018ba8aa3df2960077796246d88f8e3882b82841;hpb=30728b09540b323fef43b23dd5f1e4d1e8298c92;p=pspp-builds.git

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 018ba8aa..b95ae2e3 100644
--- 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 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
+   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -19,29 +18,33 @@
 
 #include <config.h>
 
+#include <signal.h>
+#include <stdio.h>
+
+#include <ui/debugger.h>
 #include "command-line.h"
 #include "msg-ui.h"
 #include "progname.h"
-#include "procedure.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/file-name.h>
+#include <data/format.h>
+#include <data/procedure.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 <language/prompt.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>
@@ -55,6 +58,10 @@
 #include <fenv.h>
 #endif
 
+#if HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -62,7 +69,6 @@
 
 static void i18n_init (void);
 static void fpu_init (void);
-static int execute_command (void);
 static void terminate (bool success) NO_RETURN;
 
 /* If a segfault happens, issue a message to that effect and halt */
@@ -70,72 +76,70 @@ void bug_handler(int sig);
 
 /* Handle quit/term/int signals */
 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);
   signal (SIGINT, interrupt_handler);
 
-  set_program_name ("pspp");
+  set_program_name (argv[0]);
+
   i18n_init ();
   fpu_init ();
   gsl_set_error_handler_off ();
 
+  fmt_init ();
   outp_init ();
-  msg_ui_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 ();
 
-  default_dict = dict_create ();
+  factory = fastfile_factory_create ();
+
+  the_dataset = create_dataset (factory, NULL, NULL);
 
-  if (parse_command_line (argc, argv)) 
+  if (parse_command_line (argc, argv, the_source_stream))
     {
+      msg_ui_init (the_source_stream);
       outp_read_devices ();
-      lex_init ();
+      the_lexer = lex_create (the_source_stream);
 
       for (;;)
         {
-          int result = execute_command ();
-          if (result == CMD_EOF || result == CMD_QUIT)
+          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 ());
-}
 
-/* Parses a command and returns the result. */
-static int
-execute_command (void)
-{
-  /* 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);
-  lex_get ();
-  if (token == T_STOP)
-    return CMD_EOF;
-
-  /* Parse the command.
-     Any lines read after the first token must be continuation
-     lines. */
-  getl_set_prompt_style (GETL_PROMPT_LATER);
-  return cmd_parse (vfm_source != NULL ? CMD_STATE_DATA : CMD_STATE_INITIAL);
+  terminate (!any_errors ());
 }
 
 static void
@@ -159,6 +163,8 @@ fpu_init (void)
   feholdexcept (&foo);
 #elif HAVE___SETFPUCW && defined(_FPU_IEEE)
   __setfpucw (_FPU_IEEE);
+#elif HAVE_FPSETMASK
+  fpsetmask (0);
 #endif
 }
 
@@ -166,17 +172,19 @@ fpu_init (void)
 void 
 bug_handler(int sig)
 {
+#if DEBUGGING
+  connect_debugger ();
+#endif
   switch (sig) 
     {
+    case SIGABRT:
+      request_bug_report_and_abort("Assertion Failure/Abort");
     case SIGFPE:
       request_bug_report_and_abort("Floating Point Exception");
-      break;
     case SIGSEGV:
       request_bug_report_and_abort("Segmentation Violation");
-      break;
     default:
-      request_bug_report_and_abort("");
-      break;
+      request_bug_report_and_abort("Unknown");
     }
 }
 
@@ -197,18 +205,19 @@ terminate (bool success)
     {
       terminating = true;
 
-      cancel_transformations ();
-      dict_destroy (default_dict);
+      destroy_dataset (the_dataset);
 
       random_done ();
       settings_done ();
       fh_done ();
-      lex_done ();
-      getl_uninitialize ();
+      lex_destroy (the_lexer);
+      destroy_source_stream (the_source_stream);
+      prompt_done ();
       readln_uninitialize ();
 
       outp_done ();
       msg_ui_done ();
+      fmt_done ();
     }
   exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
 }