X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fcontrol%2Floop.c;h=f31486f605f7bd7680257bf4dd0710738374b02a;hb=0188d216a999f6f45ccb98f6ee40bb82c13ac7fd;hp=ff38ba5f042bcfbbc4ee84e734f2a822ab35a874;hpb=2322678e8fddbbf158b01b2720db2636404bba3b;p=pspp-builds.git

diff --git a/src/language/control/loop.c b/src/language/control/loop.c
index ff38ba5f..f31486f6 100644
--- a/src/language/control/loop.c
+++ b/src/language/control/loop.c
@@ -18,21 +18,23 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
-#include "alloc.h"
-#include "case.h"
-#include "command.h"
-#include "compiler.h"
-#include "dictionary.h"
+
 #include "control-stack.h"
-#include "message.h"
-#include "expressions/public.h"
-#include "lexer.h"
-#include "misc.h"
-#include "pool.h"
-#include "settings.h"
-#include "str.h"
-#include "variable.h"
+#include <data/case.h>
+#include <data/dictionary.h>
+#include <data/procedure.h>
+#include <data/settings.h>
+#include <data/transformations.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/expressions/public.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/alloc.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
+#include <libpspp/str.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -79,6 +81,7 @@ struct loop_trns
 
 static struct ctl_class loop_class;
 
+static trns_finalize_func loop_trns_finalize;
 static trns_proc_func loop_trns_proc, end_loop_trns_proc, break_trns_proc;
 static trns_free_func loop_trns_free;
 
@@ -116,7 +119,7 @@ cmd_loop (void)
   
   if (!ok)
     loop->max_pass_count = 0;
-  return ok ? CMD_SUCCESS : CMD_PART_SUCCESS;
+  return ok ? CMD_SUCCESS : CMD_FAILURE;
 }
 
 /* Parses END LOOP. */
@@ -141,7 +144,7 @@ cmd_end_loop (void)
 
   ctl_stack_pop (loop);
   
-  return ok ? CMD_SUCCESS : CMD_PART_SUCCESS;
+  return ok ? CMD_SUCCESS : CMD_FAILURE;
 }
 
 /* Parses BREAK. */
@@ -248,7 +251,8 @@ create_loop_trns (void)
   loop->first_expr = loop->by_expr = loop->last_expr = NULL;
   loop->loop_condition = loop->end_loop_condition = NULL;
 
-  add_transformation (loop_trns_proc, loop_trns_free, loop);
+  add_transformation_with_finalizer (loop_trns_finalize,
+                                     loop_trns_proc, loop_trns_free, loop);
   loop->past_LOOP_index = next_transformation ();
 
   ctl_stack_push (&loop_class, loop);
@@ -256,6 +260,17 @@ create_loop_trns (void)
   return loop;
 }
 
+/* Finalizes LOOP by clearing the control stack, thus ensuring
+   that all open LOOPs are closed. */ 
+static void
+loop_trns_finalize (void *do_if_ UNUSED) 
+{
+  /* This will be called multiple times if multiple LOOPs were
+     executed, which is slightly unclean, but at least it's
+     idempotent. */
+  ctl_stack_clear ();
+}
+
 /* Sets up LOOP for the first pass. */
 static int
 loop_trns_proc (void *loop_, struct ccase *c, int case_num)