X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=2f7d1fbea7baada5b5aafd6d50ff09139518e78f;hb=9491a8bd354152d3a228e1bf041c7ad6228750d7;hp=0a09cda97c71d27200f2802fd2a53804f04c0847;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 0a09cda9..2f7d1fbe 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
@@ -18,24 +17,34 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include <gsl/gsl_errno.h>
+
 #include <signal.h>
 #include <stdio.h>
+
+#include <ui/debugger.h>
 #include "command-line.h"
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
-#include "file-handle-def.h"
-#include "filename.h"
-#include "line-buffer.h"
-#include "lexer.h"
-#include "output.h"
+#include "msg-ui.h"
 #include "progname.h"
-#include "random.h"
 #include "read-line.h"
-#include "settings.h"
-#include "variable.h"
-#include "version.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/prompt.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <libpspp/version.h>
+#include <math/random.h>
+#include <output/output.h>
 
 #if HAVE_FPU_CONTROL_H
 #include <fpu_control.h>
@@ -54,25 +63,27 @@
 
 #include <stdlib.h>
 
-#include "debug-print.h"
-
 static void i18n_init (void);
 static void fpu_init (void);
-static void handle_error (int code);
-static int execute_command (void);
+static void terminate (bool success) NO_RETURN;
 
 /* If a segfault happens, issue a message to that effect and halt */
 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 ;
 
-void terminate (bool success);
 
 /* 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);
@@ -82,117 +93,48 @@ main (int argc, char **argv)
   fpu_init ();
   gsl_set_error_handler_off ();
 
+  fmt_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 ();
 
-  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 retval;
+          int result = cmd_parse (the_lexer, the_dataset);
 
-          err_check_count ();
-
-          retval = execute_command ();
-          if (retval == CMD_EOF)
+          if (result == CMD_EOF || result == CMD_FINISH)
             break;
-          if (retval != CMD_SUCCESS)
-            handle_error (retval);
+          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 (the_source_stream); 
+            }
+          else
+            check_msg_count (the_source_stream);
         }
     }
-  
-  terminate (err_error_count == 0);
-  abort ();
-}
-
-/* Parse and execute a command, returning its return code. */
-static int
-execute_command (void)
-{
-  int result;
-  
-  /* 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);
-  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
-   CODE. */
-static void
-handle_error (int code)
-{
-  if (code == CMD_CASCADING_FAILURE && !getl_is_interactive ()) 
-    {
-      msg (SW, _("This command not executed.  Stopping here "
-                 "to avoid cascading failures."));
-      getl_abort_noninteractive ();
-      return;
-    }
-
-  switch (code)
-    {
-    case CMD_FAILURE:
-    case CMD_CASCADING_FAILURE:
-      msg (SW,  _("This command not executed."));
-      break;
-
-    case CMD_PART_SUCCESS_MAYBE:
-      msg (SW, _("Skipping the rest of this command.  Part of "
-		 "this command may have been executed."));
-      break;
-		  
-    case CMD_PART_SUCCESS:
-      msg (SW, _("Skipping the rest of this command.  This "
-		 "command was fully executed up to this point."));
-      break;
-
-    case CMD_TRAILING_GARBAGE:
-      msg (SW, _("Trailing garbage was encountered following "
-		 "this command.  The command was fully executed "
-		 "to this point."));
-      break;
-
-    default:
-      abort ();
-    }
 
-  if (!getl_is_interactive ())
-    {
-      while (token != T_STOP && token != '.')
-	lex_get ();
-    }
-  else 
-    {
-      msg (SW, _("The rest of this command has been discarded."));
-      lex_discard_line (); 
-    }
+  terminate (!any_errors ());
 }
 
 static void
@@ -223,17 +165,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");
     }
 }
 
@@ -246,25 +190,27 @@ interrupt_handler(int sig UNUSED)
 
 /* Terminate PSPP.  SUCCESS should be true to exit successfully,
    false to exit as a failure.  */
-void
+static void
 terminate (bool success)
 {
   static bool terminating = false;
-  if (terminating)
-    return;
-  terminating = true;
-
-  err_done ();
-  outp_done ();
+  if (!terminating) 
+    {
+      terminating = true;
 
-  cancel_transformations ();
-  dict_destroy (default_dict);
+      destroy_dataset (the_dataset);
 
-  random_done ();
-  settings_done ();
-  fh_done ();
-  lex_done ();
-  getl_uninitialize ();
+      random_done ();
+      settings_done ();
+      fh_done ();
+      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);
 }