/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
02110-1301, USA. */
#include <config.h>
-#include "control-stack.h"
-#include "message.h"
+
#include <stdlib.h>
-#include "alloc.h"
-#include "command.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/value.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)
/* DO IF transformation. */
struct do_if_trns
{
+ struct dataset *ds; /* The dataset */
struct clause *clauses; /* Clauses. */
size_t clause_cnt; /* Number of clauses. */
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 int parse_clause (struct lexer *, struct do_if_trns *, struct dataset *ds);
static void add_clause (struct do_if_trns *,
struct expression *condition, int target_index);
static void add_else (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;
/* Parse DO IF. */
int
-cmd_do_if (void)
+cmd_do_if (struct lexer *lexer, struct dataset *ds)
{
struct do_if_trns *do_if = xmalloc (sizeof *do_if);
do_if->clauses = NULL;
do_if->clause_cnt = 0;
+ do_if->ds = ds;
ctl_stack_push (&do_if_class, do_if);
- add_transformation (do_if_trns_proc, do_if_trns_free, do_if);
+ add_transformation_with_finalizer (ds, do_if_finalize_func,
+ do_if_trns_proc, do_if_trns_free, do_if);
- return parse_clause (do_if);
+ return parse_clause (lexer, do_if, ds);
}
/* Parse ELSE IF. */
int
-cmd_else_if (void)
+cmd_else_if (struct lexer *lexer, struct dataset *ds)
{
struct do_if_trns *do_if = ctl_stack_top (&do_if_class);
if (do_if == NULL || !must_not_have_else (do_if))
return CMD_CASCADING_FAILURE;
- return parse_clause (do_if);
+ return parse_clause (lexer, do_if, ds);
}
/* Parse ELSE. */
int
-cmd_else (void)
+cmd_else (struct lexer *lexer, struct dataset *ds)
{
struct do_if_trns *do_if = ctl_stack_top (&do_if_class);
+ assert (ds == do_if->ds);
if (do_if == NULL || !must_not_have_else (do_if))
return CMD_CASCADING_FAILURE;
add_else (do_if);
- return lex_end_of_command ();
+ return lex_end_of_command (lexer);
}
/* Parse END IF. */
int
-cmd_end_if (void)
+cmd_end_if (struct lexer *lexer, struct dataset *ds)
{
struct do_if_trns *do_if = ctl_stack_top (&do_if_class);
+ assert (ds == do_if->ds);
+
if (do_if == NULL)
return CMD_CASCADING_FAILURE;
ctl_stack_pop (do_if);
- return lex_end_of_command ();
+ return lex_end_of_command (lexer);
}
/* Closes out DO_IF, by adding a sentinel ELSE clause if
necessary and setting past_END_IF_index. */
static void
-close_do_if (void *do_if_)
+close_do_if (void *do_if_)
{
struct do_if_trns *do_if = 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 (do_if->ds);
}
/* 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 (do_if->ds));
}
/* Returns true if DO_IF does not yet have an ELSE clause.
corresponding clause to DO_IF. Checks for end of command and
returns a command return code. */
static int
-parse_clause (struct do_if_trns *do_if)
+parse_clause (struct lexer *lexer, struct do_if_trns *do_if, struct dataset *ds)
{
struct expression *condition;
- condition = expr_parse (default_dict, EXPR_BOOLEAN);
+ condition = expr_parse (lexer, ds, EXPR_BOOLEAN);
if (condition == NULL)
return CMD_CASCADING_FAILURE;
- add_clause (do_if, condition, next_transformation ());
+ add_clause (do_if, condition, next_transformation (ds));
- return lex_end_of_command ();
+ return lex_end_of_command (lexer);
}
/* Adds a clause to DO_IF that tests for the given CONDITION and,
struct clause *clause;
if (do_if->clause_cnt > 0)
- add_transformation (break_trns_proc, NULL, do_if);
+ add_transformation (do_if->ds, 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, casenumber 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, casenumber 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",
projects / pspp-builds.git / blobdiff