X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=e19dd0c7a5eac5239aa9161a2f9380387d29fd7a;hb=75aeeafa67aa460512683311566a83917d399c70;hp=7712df83d903cb81c578a9fbdee5f1ad0b52e97e;hpb=2322678e8fddbbf158b01b2720db2636404bba3b;p=pspp-builds.git

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 7712df83..e19dd0c7 100644
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -18,25 +18,30 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include <gsl/gsl_errno.h>
+
 #include <signal.h>
 #include <stdio.h>
+
 #include "command-line.h"
-#include "command.h"
-#include "compiler.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/dictionary.h>
+#include <data/file-handle-def.h>
+#include <data/file-name.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 <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>
@@ -55,12 +60,10 @@
 
 #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);
@@ -68,7 +71,6 @@ void bug_handler(int sig);
 /* Handle quit/term/int signals */
 void interrupt_handler(int sig);
 
-void terminate (bool success);
 
 /* Program entry point. */
 int
@@ -84,14 +86,14 @@ main (int argc, char **argv)
   gsl_set_error_handler_off ();
 
   outp_init ();
+  msg_ui_init ();
   fn_init ();
   fh_init ();
   getl_initialize ();
   readln_initialize ();
   settings_init ();
   random_init ();
-
-  default_dict = dict_create ();
+  proc_init ();
 
   if (parse_command_line (argc, argv)) 
     {
@@ -100,28 +102,27 @@ main (int argc, char **argv)
 
       for (;;)
         {
-          int retval;
-
-          err_check_count ();
-
-          retval = execute_command ();
-          if (retval == CMD_EOF)
+          int result = execute_command ();
+          if (result == CMD_EOF || result == CMD_FINISH)
             break;
-          if (retval != CMD_SUCCESS)
-            handle_error (retval);
+          if (result == CMD_CASCADING_FAILURE && !getl_is_interactive ())
+            {
+              msg (SE, _("Stopping syntax file processing here to avoid "
+                         "a cascade of dependent command failures."));
+              getl_abort_noninteractive (); 
+            }
+          else
+            check_msg_count ();
         }
     }
   
-  terminate (err_error_count == 0);
-  abort ();
+  terminate (!any_errors ());
 }
 
-/* Parse and execute a command, returning its return code. */
+/* Parses a command and returns the result. */
 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);
@@ -133,67 +134,8 @@ execute_command (void)
      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 (); 
-    }
+  return cmd_parse (proc_has_source ()
+                    ? CMD_STATE_DATA : CMD_STATE_INITIAL);
 }
 
 static void
@@ -247,25 +189,25 @@ 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);
+      proc_done ();
 
-  random_done ();
-  settings_done ();
-  fh_done ();
-  lex_done ();
-  getl_uninitialize ();
+      random_done ();
+      settings_done ();
+      fh_done ();
+      lex_done ();
+      getl_uninitialize ();
+      readln_uninitialize ();
 
+      outp_done ();
+      msg_ui_done ();
+    }
   exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
 }