/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009-2011 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
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 CMD_SUCCESS;
}
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 CMD_SUCCESS;
{
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