-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 2005, 2006 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include "range-parser.h"
#include <data/data-in.h>
#include <libpspp/message.h>
#include "lexer.h"
-#include <libpspp/magic.h>
#include <libpspp/str.h>
#include <data/value.h>
+#include <data/format.h>
#include "gettext.h"
#define _(msgid) gettext (msgid)
values using *FORMAT. */
bool
parse_num_range (struct lexer *lexer,
- double *x, double *y, const enum fmt_type *format)
+ double *x, double *y, const enum fmt_type *format)
{
if (lex_match_id (lexer, "LO") || lex_match_id (lexer, "LOWEST"))
*x = LOWEST;
else if (!parse_number (lexer, x, format))
return false;
- if (lex_match_id (lexer, "THRU"))
+ if (lex_match_id (lexer, "THRU"))
{
if (lex_match_id (lexer, "HI") || lex_match_id (lexer, "HIGHEST"))
*y = HIGHEST;
else if (!parse_number (lexer, y, format))
return false;
- if (*y < *x)
+ if (*y < *x)
{
double t;
msg (SW, _("Low end of range (%g) is below high end (%g). "
*x = *y;
*y = t;
}
- else if (*x == *y)
+ else if (*x == *y)
msg (SW, _("Ends of range are equal (%g)."), *x);
return true;
}
else
{
- if (*x == LOWEST)
+ if (*x == LOWEST)
{
msg (SE, _("LO or LOWEST must be part of a range."));
return false;
}
*y = *x;
}
-
+
return true;
}
static bool
parse_number (struct lexer *lexer, double *x, const enum fmt_type *format)
{
- if (lex_is_number (lexer))
+ if (lex_is_number (lexer))
{
*x = lex_number (lexer);
lex_get (lexer);
return true;
}
- else if (lex_token (lexer) == T_STRING && format != NULL)
+ else if (lex_token (lexer) == T_STRING && format != NULL)
{
union value v;
- data_in (ds_ss (lex_tokstr (lexer)), *format, 0, 0, &v, 0);
+ data_in (ds_ss (lex_tokstr (lexer)), LEGACY_NATIVE,
+ *format, 0, 0, 0, &v, 0);
lex_get (lexer);
*x = v.f;
if (*x == SYSMIS)
}
return true;
}
- else
+ else
{
if (format != NULL)
lex_error (lexer, _("expecting number or data string"));
else
lex_force_num (lexer);
- return false;
+ return false;
}
}