#include <stdlib.h>
#include "control-stack.h"
-#include <libpspp/message.h>
-#include <libpspp/alloc.h>
+#include <data/procedure.h>
+#include <data/transformations.h>
+#include <data/variable.h>
#include <language/command.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.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 <data/variable.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
int past_END_IF_index; /* Transformation just past last clause. */
};
-static struct ctl_class do_if_class;
+static const struct ctl_class do_if_class;
static int parse_clause (struct do_if_trns *);
static void add_clause (struct do_if_trns *,
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 (current_dataset, do_if_finalize_func,
+ do_if_trns_proc, do_if_trns_free, do_if);
return parse_clause (do_if);
}
if (!has_else (do_if))
add_else (do_if);
- do_if->past_END_IF_index = next_transformation ();
+ do_if->past_END_IF_index = next_transformation (current_dataset);
}
/* Adds an ELSE clause to DO_IF pointing to the next
add_else (struct do_if_trns *do_if)
{
assert (!has_else (do_if));
- add_clause (do_if, NULL, next_transformation ());
+ add_clause (do_if, NULL, next_transformation (current_dataset));
}
/* Returns true if DO_IF does not yet have an ELSE clause.
{
struct expression *condition;
- condition = expr_parse (default_dict, EXPR_BOOLEAN);
+ condition = expr_parse (dataset_dict (current_dataset), EXPR_BOOLEAN);
if (condition == NULL)
return CMD_CASCADING_FAILURE;
- add_clause (do_if, condition, next_transformation ());
+ add_clause (do_if, condition, next_transformation (current_dataset));
return lex_end_of_command ();
}
struct clause *clause;
if (do_if->clause_cnt > 0)
- add_transformation (break_trns_proc, NULL, do_if);
+ add_transformation (current_dataset, break_trns_proc, NULL, do_if);
do_if->clauses = xnrealloc (do_if->clauses,
do_if->clause_cnt + 1, sizeof *do_if->clauses);
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. */
static int
-do_if_trns_proc (void *do_if_, struct ccase *c, int case_num UNUSED)
+do_if_trns_proc (void *do_if_, struct ccase *c, casenum_t case_num UNUSED)
{
struct do_if_trns *do_if = do_if_;
struct clause *clause;
/* Breaks out of a DO IF construct. */
static int
-break_trns_proc (void *do_if_, struct ccase *c UNUSED, int case_num UNUSED)
+break_trns_proc (void *do_if_, struct ccase *c UNUSED, casenum_t case_num UNUSED)
{
struct do_if_trns *do_if = do_if_;
}
/* DO IF control structure class definition. */
-static struct ctl_class do_if_class =
+static const struct ctl_class do_if_class =
{
"DO IF",
"END IF",