projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CTABLES remove some vestigial multiple response support
[pspp]
/
src
/
language
/
data-io
/
placement-parser.h
diff --git
a/src/language/data-io/placement-parser.h
b/src/language/data-io/placement-parser.h
index 09292c3b5045993f82c872514a04ecf857f8659d..19711d04be37412ca43d945d2b05c7c9622daf1c 100644
(file)
--- a/
src/language/data-io/placement-parser.h
+++ b/
src/language/data-io/placement-parser.h
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ 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
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
@@
-19,17
+19,20
@@
#include <stdbool.h>
#include <stddef.h>
#include <stdbool.h>
#include <stddef.h>
+#include "data/format.h"
-struct fmt_spec;
struct pool;
struct lexer;
bool parse_record_placement (struct lexer *, int *record, int *column);
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,
- struct fmt_spec **, size_t *format_cnt);
+bool parse_var_placements (struct lexer *, struct pool *, size_t n_vars,
+ enum fmt_use,
+ struct fmt_spec **, size_t *n_formats);
bool execute_placement_format (const struct fmt_spec *,
int *record, int *column);
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 */
bool *range_specified);
#endif /* language/data-io/placement-parser.h */