/* PSPP - a program for statistical analysis.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2010 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 <libpspp/pool.h>
#include <libpspp/str.h>
+#include <data/format.h>
+
#include "xalloc.h"
#include "xsize.h"
assert (var_cnt > 0);
if (lex_is_number (lexer))
return fixed_parse_columns (lexer, pool, var_cnt, for_input, formats, format_cnt);
- else if (lex_match (lexer, '('))
+ else if (lex_match (lexer, T_LPAREN))
{
size_t assignment_cnt;
size_t i;
if (assignment_cnt != var_cnt)
{
- msg (SE, _("Number of variables specified (%d) "
- "differs from number of variable formats (%d)."),
- (int) var_cnt, (int) assignment_cnt);
+ msg (SE, _("Number of variables specified (%zu) "
+ "differs from number of variable formats (%zu)."),
+ var_cnt, assignment_cnt);
return false;
}
int fc, lc;
size_t i;
- if ( !parse_column_range (lexer, &fc, &lc, NULL) )
+ if ( !parse_column_range (lexer, 1, &fc, &lc, NULL) )
return false;
/* Divide columns evenly. */
if ((lc - fc + 1) % var_cnt)
{
msg (SE, _("The %d columns %d-%d "
- "can't be evenly divided into %u fields."),
- lc - fc + 1, fc, lc, (unsigned int) var_cnt);
+ "can't be evenly divided into %zu fields."),
+ lc - fc + 1, fc, lc, var_cnt);
return false;
}
/* Format specifier. */
- if (lex_match (lexer, '('))
+ if (lex_match (lexer, T_LPAREN))
{
/* Get format type. */
if (lex_token (lexer) == T_ID)
{
if (!parse_format_specifier_name (lexer, &format.type))
return false;
- lex_match (lexer, ',');
+ lex_match (lexer, T_COMMA);
}
else
format.type = FMT_F;
else
format.d = 0;
- if (!lex_force_match (lexer, ')'))
+ if (!lex_force_match (lexer, T_RPAREN))
return false;
}
else
size_t formats_used = 0;
*formats = NULL;
- while (!lex_match (lexer, ')'))
+ while (!lex_match (lexer, T_RPAREN))
{
struct fmt_spec f;
struct fmt_spec *new_formats;
count = 1;
/* Parse format specifier. */
- if (lex_match (lexer, '('))
+ if (lex_match (lexer, T_LPAREN))
{
/* Call ourselves recursively to handle parentheses. */
if (!fixed_parse_fortran (lexer, pool, for_input,
{
new_formats = &f;
new_format_cnt = 1;
- if (lex_match (lexer, '/'))
+ if (lex_match (lexer, T_SLASH))
f.type = PRS_TYPE_NEW_REC;
else
{
{
if (!fmt_from_name (type, &f.type))
{
- msg (SE, _("Unknown format type \"%s\"."), type);
+ msg (SE, _("Unknown format type `%s'."), type);
return false;
}
if (!fmt_check (&f, for_input))
formats_used += new_format_cnt;
}
- lex_match (lexer, ',');
+ lex_match (lexer, T_COMMA);
}
*format_cnt = formats_used;
}
}
+/* Parses a BASE-based column using LEXER. Returns true and
+ stores a 1-based column number into *COLUMN if successful,
+ otherwise emits an error message and returns false. */
+static bool
+parse_column (int value, int base, int *column)
+{
+ assert (base == 0 || base == 1);
+ *column = value - base + 1;
+ if (*column < 1)
+ {
+ if (base == 1)
+ msg (SE, _("Column positions for fields must be positive."));
+ else
+ msg (SE, _("Column positions for fields must not be negative."));
+ return false;
+ }
+ return true;
+}
+
/* Parse a column or a range of columns, specified as a single
- integer or two integer delimited by a dash. Stores the range
+ integer or two integers delimited by a dash. Stores the range
in *FIRST_COLUMN and *LAST_COLUMN. (If only a single integer
is given, it is stored in both.) If RANGE_SPECIFIED is
non-null, then *RANGE_SPECIFIED is set to true if the syntax
contained a dash, false otherwise. Returns true if
successful, false if the syntax was invalid or the values
- specified did not make sense. */
+ specified did not make sense.
+
+ If BASE is 0, zero-based column numbers are parsed; if BASE is
+ 1, 1-based column numbers are parsed. Regardless of BASE, the
+ values stored in *FIRST_COLUMN and *LAST_COLUMN are
+ 1-based. */
bool
-parse_column_range (struct lexer *lexer, int *first_column, int *last_column,
+parse_column_range (struct lexer *lexer, int base,
+ int *first_column, int *last_column,
bool *range_specified)
{
/* First column. */
- if (!lex_force_int (lexer))
+ if (!lex_force_int (lexer)
+ || !parse_column (lex_integer (lexer), base, first_column))
return false;
- *first_column = lex_integer (lexer);
- if (*first_column < 1)
- {
- msg (SE, _("Column positions for fields must be positive."));
- return false;
- }
lex_get (lexer);
/* Last column. */
- lex_negative_to_dash (lexer);
- if (lex_match (lexer, '-'))
+ if (lex_is_integer (lexer) && lex_integer (lexer) < 0)
{
- if (!lex_force_int (lexer))
- return false;
- *last_column = lex_integer (lexer);
- if (*last_column < 1)
- {
- msg (SE, _("Column positions for fields must be positive."));
- return false;
- }
- else if (*last_column < *first_column)
+ if (!parse_column (-lex_integer (lexer), base, last_column))
+ return false;
+ lex_get (lexer);
+
+ if (*last_column < *first_column)
{
msg (SE, _("The ending column for a field must be "
"greater than the starting column."));
if (range_specified)
*range_specified = true;
- lex_get (lexer);
}
else
{
bool
parse_record_placement (struct lexer *lexer, int *record, int *column)
{
- while (lex_match (lexer, '/'))
+ while (lex_match (lexer, T_SLASH))
{
if (lex_is_integer (lexer))
{