02110-1301, USA. */
#include <config.h>
-#include "control-stack.h"
-#include "message.h"
+
#include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "compiler.h"
-#include "message.h"
-#include "expressions/public.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
+
+#include "control-stack.h"
+#include <data/procedure.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/message.h>
+#include <libpspp/str.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
static bool must_not_have_else (struct do_if_trns *);
static void close_do_if (void *do_if);
+static trns_finalize_func do_if_finalize_func;
static trns_proc_func do_if_trns_proc, break_trns_proc;
static trns_free_func do_if_trns_free;
do_if->clause_cnt = 0;
ctl_stack_push (&do_if_class, do_if);
- add_transformation (do_if_trns_proc, do_if_trns_free, do_if);
+ add_transformation_with_finalizer (do_if_finalize_func,
+ do_if_trns_proc, do_if_trns_free, do_if);
return parse_clause (do_if);
}
clause->target_index = target_index;
}
+/* Finalizes DO IF by clearing the control stack, thus ensuring
+ that all open DO IFs are closed. */
+static void
+do_if_finalize_func (void *do_if_ UNUSED)
+{
+ /* This will be called multiple times if multiple DO IFs were
+ executed, which is slightly unclean, but at least it's
+ idempotent. */
+ ctl_stack_clear ();
+}
+
/* DO IF transformation procedure.
Checks each clause and jumps to the appropriate
transformation. */