/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009-2012 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <stdlib.h>
-#include "control-stack.h"
-#include <data/case.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/compiler.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/case.h"
+#include "data/dataset.h"
+#include "data/transformations.h"
+#include "data/value.h"
+#include "language/command.h"
+#include "language/control/control-stack.h"
+#include "language/expressions/public.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
-#include "xalloc.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
{
struct dataset *ds; /* The dataset */
struct clause *clauses; /* Clauses. */
- size_t clause_cnt; /* Number of clauses. */
+ size_t n_clauses; /* Number of clauses. */
int past_END_IF_index; /* Transformation just past last clause. */
};
{
struct do_if_trns *do_if = xmalloc (sizeof *do_if);
do_if->clauses = NULL;
- do_if->clause_cnt = 0;
+ do_if->n_clauses = 0;
do_if->ds = ds;
ctl_stack_push (&do_if_class, do_if);
/* Parse ELSE. */
int
-cmd_else (struct lexer *lexer, struct dataset *ds)
+cmd_else (struct lexer *lexer UNUSED, 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;
+
+ assert (ds == do_if->ds);
+
add_else (do_if);
- return lex_end_of_command (lexer);
+ return CMD_SUCCESS;
}
/* Parse END IF. */
int
-cmd_end_if (struct lexer *lexer, struct dataset *ds)
+cmd_end_if (struct lexer *lexer UNUSED, 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;
+ assert (ds == do_if->ds);
ctl_stack_pop (do_if);
- return lex_end_of_command (lexer);
+ return CMD_SUCCESS;
}
/* Closes out DO_IF, by adding a sentinel ELSE clause if
{
if (has_else (do_if))
{
- msg (SE, _("This command may not follow ELSE in DO IF...END IF."));
+ msg (SE, _("This command may not follow %s in %s ... %s."), "ELSE", "DO IF", "END IF");
return false;
}
else
static bool
has_else (struct do_if_trns *do_if)
{
- return (do_if->clause_cnt != 0
- && do_if->clauses[do_if->clause_cnt - 1].condition == NULL);
+ return (do_if->n_clauses != 0
+ && do_if->clauses[do_if->n_clauses - 1].condition == NULL);
}
/* Parses a DO IF or ELSE IF expression and appends the
{
struct expression *condition;
- condition = expr_parse (lexer, ds, EXPR_BOOLEAN);
+ condition = expr_parse_bool (lexer, NULL, ds);
if (condition == NULL)
return CMD_CASCADING_FAILURE;
add_clause (do_if, condition);
- return lex_end_of_command (lexer);
+ return CMD_SUCCESS;
}
/* Adds a clause to DO_IF that tests for the given CONDITION and,
{
struct clause *clause;
- if (do_if->clause_cnt > 0)
+ if (do_if->n_clauses > 0)
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 = &do_if->clauses[do_if->clause_cnt++];
+ do_if->n_clauses + 1, sizeof *do_if->clauses);
+ clause = &do_if->clauses[do_if->n_clauses++];
clause->condition = condition;
clause->target_index = next_transformation (do_if->ds);
}
struct do_if_trns *do_if = do_if_;
struct clause *clause;
- for (clause = do_if->clauses; clause < do_if->clauses + do_if->clause_cnt;
+ for (clause = do_if->clauses; clause < do_if->clauses + do_if->n_clauses;
clause++)
{
if (clause->condition != NULL)
struct do_if_trns *do_if = do_if_;
struct clause *clause;
- for (clause = do_if->clauses; clause < do_if->clauses + do_if->clause_cnt;
+ for (clause = do_if->clauses; clause < do_if->clauses + do_if->n_clauses;
clause++)
expr_free (clause->condition);
free (do_if->clauses);