X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fplacement-parser.c;h=cf9981de8f88f93fe028de7ce4ddfcef6e55a929;hb=7dfbf1beae10727cc07213b2c74a991859f9fcbc;hp=e9fe337268b6ef86ebeca66139f439b9483341e2;hpb=691c25e36fd1ee722dd35419d6110e3876b99f9c;p=pspp diff --git a/src/language/data-io/placement-parser.c b/src/language/data-io/placement-parser.c index e9fe337268..cf9981de8f 100644 --- a/src/language/data-io/placement-parser.c +++ b/src/language/data-io/placement-parser.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006, 2010 Free Software Foundation, Inc. + Copyright (C) 2006, 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 @@ -16,20 +16,19 @@ #include -#include +#include "language/data-io/placement-parser.h" #include -#include -#include -#include -#include -#include +#include "data/format.h" +#include "language/lexer/format-parser.h" +#include "language/lexer/lexer.h" +#include "libpspp/message.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" -#include - -#include "xalloc.h" -#include "xsize.h" +#include "gl/xalloc.h" +#include "gl/xsize.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -43,9 +42,9 @@ enum PRS_TYPE_NEW_REC /* Next record. */ }; -static bool fixed_parse_columns (struct lexer *, struct pool *, size_t var_cnt, bool for_input, - struct fmt_spec **, size_t *); -static bool fixed_parse_fortran (struct lexer *l, struct pool *, bool for_input, +static bool fixed_parse_columns (struct lexer *, struct pool *, size_t var_cnt, + enum fmt_use, struct fmt_spec **, size_t *); +static bool fixed_parse_fortran (struct lexer *l, struct pool *, enum fmt_use, struct fmt_spec **, size_t *); /* Parses Fortran-like or column-based specifications for placing @@ -64,18 +63,20 @@ static bool fixed_parse_fortran (struct lexer *l, struct pool *, bool for_input, Uses POOL for allocation. When the caller is finished interpreting *FORMATS, POOL may be destroyed. */ bool -parse_var_placements (struct lexer *lexer, struct pool *pool, size_t var_cnt, bool for_input, +parse_var_placements (struct lexer *lexer, struct pool *pool, size_t var_cnt, + enum fmt_use use, struct fmt_spec **formats, size_t *format_cnt) { assert (var_cnt > 0); if (lex_is_number (lexer)) - return fixed_parse_columns (lexer, pool, var_cnt, for_input, formats, format_cnt); + return fixed_parse_columns (lexer, pool, var_cnt, use, + formats, format_cnt); else if (lex_match (lexer, T_LPAREN)) { size_t assignment_cnt; size_t i; - if (!fixed_parse_fortran (lexer, pool, for_input, formats, format_cnt)) + if (!fixed_parse_fortran (lexer, pool, use, formats, format_cnt)) return false; assignment_cnt = 0; @@ -102,7 +103,8 @@ parse_var_placements (struct lexer *lexer, struct pool *pool, size_t var_cnt, bo /* Implements parse_var_placements for column-based formats. */ static bool -fixed_parse_columns (struct lexer *lexer, struct pool *pool, size_t var_cnt, bool for_input, +fixed_parse_columns (struct lexer *lexer, struct pool *pool, size_t var_cnt, + enum fmt_use use, struct fmt_spec **formats, size_t *format_cnt) { struct fmt_spec format; @@ -152,7 +154,7 @@ fixed_parse_columns (struct lexer *lexer, struct pool *pool, size_t var_cnt, boo format.type = FMT_F; format.d = 0; } - if (!fmt_check (&format, for_input)) + if (!fmt_check (&format, use)) return false; *formats = pool_nalloc (pool, var_cnt + 1, sizeof **formats); @@ -166,7 +168,7 @@ fixed_parse_columns (struct lexer *lexer, struct pool *pool, size_t var_cnt, boo /* Implements parse_var_placements for Fortran-like formats. */ static bool -fixed_parse_fortran (struct lexer *lexer, struct pool *pool, bool for_input, +fixed_parse_fortran (struct lexer *lexer, struct pool *pool, enum fmt_use use, struct fmt_spec **formats, size_t *format_cnt) { size_t formats_allocated = 0; @@ -194,7 +196,7 @@ fixed_parse_fortran (struct lexer *lexer, struct pool *pool, bool for_input, if (lex_match (lexer, T_LPAREN)) { /* Call ourselves recursively to handle parentheses. */ - if (!fixed_parse_fortran (lexer, pool, for_input, + if (!fixed_parse_fortran (lexer, pool, use, &new_formats, &new_format_cnt)) return false; } @@ -226,7 +228,7 @@ fixed_parse_fortran (struct lexer *lexer, struct pool *pool, bool for_input, msg (SE, _("Unknown format type `%s'."), type); return false; } - if (!fmt_check (&f, for_input)) + if (!fmt_check (&f, use)) return false; } } @@ -293,12 +295,10 @@ execute_placement_format (const struct fmt_spec *format, stores a 1-based column number into *COLUMN if successful, otherwise emits an error message and returns false. */ static bool -parse_column (struct lexer *lexer, int base, int *column) +parse_column (int value, int base, int *column) { assert (base == 0 || base == 1); - if (!lex_force_int (lexer)) - return false; - *column = lex_integer (lexer) - base + 1; + *column = value - base + 1; if (*column < 1) { if (base == 1) @@ -307,7 +307,6 @@ parse_column (struct lexer *lexer, int base, int *column) msg (SE, _("Column positions for fields must not be negative.")); return false; } - lex_get (lexer); return true; } @@ -330,15 +329,18 @@ parse_column_range (struct lexer *lexer, int base, bool *range_specified) { /* First column. */ - if (!parse_column (lexer, base, first_column)) + if (!lex_force_int (lexer) + || !parse_column (lex_integer (lexer), base, first_column)) return false; + lex_get (lexer); /* Last column. */ - lex_negative_to_dash (lexer); - if (lex_match (lexer, T_DASH)) + if (lex_is_integer (lexer) && lex_integer (lexer) < 0) { - if (!parse_column (lexer, base, last_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 "