X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=src%2Flanguage%2Fdata-io%2Fplacement-parser.h;h=8f8d68c4ce4f013b61ede2c3ce4e3174f153c895;hb=42d90dac4bc5ee06ef0dd3cd62b84378f16e7ea9;hp=8bf8109ba4d531c9ebe885ae6e42479f98e8d746;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp
diff --git a/src/language/data-io/placement-parser.h b/src/language/data-io/placement-parser.h
index 8bf8109ba4..8f8d68c4ce 100644
--- a/src/language/data-io/placement-parser.h
+++ b/src/language/data-io/placement-parser.h
@@ -1,37 +1,38 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 2006, 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 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 . */
#ifndef LANGUAGE_DATA_IO_PLACEMENT_PARSER_H
#define LANGUAGE_DATA_IO_PLACEMENT_PARSER_H 1
#include
#include
+#include "data/format.h"
-struct fmt_spec;
struct pool;
struct lexer;
bool parse_record_placement (struct lexer *, int *record, int *column);
-bool parse_var_placements (struct lexer *, struct pool *, size_t var_cnt, bool for_input,
+bool parse_var_placements (struct lexer *, struct pool *, size_t var_cnt,
+ enum fmt_use,
struct fmt_spec **, size_t *format_cnt);
bool execute_placement_format (const struct fmt_spec *,
int *record, int *column);
-bool parse_column_range (struct lexer *, int *first_column, int *last_column,
+bool parse_column (struct lexer *lexer, int base, int *column);
+bool parse_column_range (struct lexer *, int base,
+ int *first_column, int *last_column,
bool *range_specified);
#endif /* language/data-io/placement-parser.h */