Continue reforming procedure execution. In this phase, move

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

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 16058e45d33913dda0224d721fc7e188409e93a9..e19dd0c7a5eac5239aa9161a2f9380387d29fd7a 100644 (file)
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -19,6 +19,9 @@
 
 #include <config.h>
 
+#include <signal.h>
+#include <stdio.h>
+
 #include "command-line.h"
 #include "msg-ui.h"
 #include "progname.h"
@@ -27,6 +30,7 @@
 #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>
@@ -38,9 +42,6 @@
 #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>
@@ -61,7 +62,6 @@
 
 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;
 
@@ -93,8 +93,7 @@ main (int argc, char **argv)
   readln_initialize ();
   settings_init ();
   random_init ();
-
-  default_dict = dict_create ();
+  proc_init ();
 
   if (parse_command_line (argc, argv)) 
     {
@@ -103,27 +102,27 @@ main (int argc, char **argv)
 
       for (;;)
         {
-          int retval;
-
-          check_msg_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 (!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);
@@ -135,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);
 }
 \f
 static void
@@ -257,8 +197,7 @@ terminate (bool success)
     {
       terminating = true;
 
-      cancel_transformations ();
-      dict_destroy (default_dict);
+      proc_done ();
 
       random_done ();
       settings_done ();