/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2010, 2011, 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 "data/dataset.h"
#include "data/dictionary.h"
-#include "data/procedure.h"
#include "data/variable.h"
#include "language/command.h"
#include "language/lexer/lexer.h"
#include "libpspp/assertion.h"
#include "libpspp/bit-vector.h"
#include "libpspp/compiler.h"
+#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/misc.h"
#include "libpspp/str.h"
this type. */
unsigned already_encountered = 0;
- /* What we're gonna do to the active file. */
+ /* What we are going to do to the active dataset. */
struct var_modification vm;
/* Return code. */
if (already_encountered & 1)
{
- msg (SE, _("%s subcommand may be given at most once."), "REORDER");
+ lex_sbc_only_once ("REORDER");
goto done;
}
already_encountered |= 1;
{
if (!lex_match (lexer, T_LPAREN))
{
- msg (SE, _("`(' expected on %s subcommand."), "REORDER");
+ lex_error_expecting (lexer, "`('", NULL_SENTINEL);
free (v);
goto done;
}
}
if (!lex_match (lexer, T_RPAREN))
{
- msg (SE, _("`)' expected following variable names on "
- "REORDER subcommand."));
+ lex_error_expecting (lexer, "`)'", NULL_SENTINEL);
free (v);
goto done;
}
{
if (already_encountered & 2)
{
- msg (SE, _("%s subcommand may be given at most once."), "RENAME");
+ lex_sbc_only_once ("RENAME");
goto done;
}
already_encountered |= 2;
if (!lex_match (lexer, T_LPAREN))
{
- msg (SE, _("`(' expected on %s subcommand."), "RENAME");
+ lex_error_expecting (lexer, "`('", NULL_SENTINEL);
goto done;
}
if (!parse_variables (lexer, dataset_dict (ds),
goto done;
if (!lex_match (lexer, T_EQUALS))
{
- msg (SE, _("`=' expected between lists of new and old variable "
- "names on RENAME subcommand."));
+ lex_error_expecting (lexer, "`='", NULL_SENTINEL);
goto done;
}
if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
}
if (!lex_match (lexer, T_RPAREN))
{
- msg (SE, _("`)' expected after variable lists on RENAME "
- "subcommand."));
+ lex_error_expecting (lexer, "`)'", NULL_SENTINEL);
goto done;
}
}
break;
if (lex_token (lexer) != T_SLASH)
{
- msg (SE, _("`/' or `.' expected."));
+ lex_error_expecting (lexer, "`/'", "`.'", NULL_SENTINEL);
goto done;
}
lex_get (lexer);
result = a_index < b_index ? -1 : a_index > b_index;
}
else
- result = strcasecmp (var_get_name (a), var_get_name (b));
+ result = utf8_strcasecmp (var_get_name (a), var_get_name (b));
if (!ordering->forward)
result = -result;
return result;
const struct var_renaming *a = a_;
const struct var_renaming *b = b_;
- return strcasecmp (a->new_name, b->new_name);
+ return utf8_strcasecmp (a->new_name, b->new_name);
}
/* Returns true if performing VM on dictionary D would not cause