projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rewrite expression code.
[pspp-builds.git]
/
src
/
data-list.c
diff --git
a/src/data-list.c
b/src/data-list.c
index 756fedc8b29219657be598771fe443cb53d8e571..eb491d1d9dd72e0f50c19300b50a142e4550bc74 100644
(file)
--- a/
src/data-list.c
+++ b/
src/data-list.c
@@
-535,7
+535,7
@@
fixed_parse_compatible (struct fixed_parsing_state *fx,
input.type = FMT_F;
input.d = 0;
}
input.type = FMT_F;
input.d = 0;
}
- if (!check_input_specifier (&input))
+ if (!check_input_specifier (&input
, 1
))
return 0;
/* Start column for next specification. */
return 0;
/* Start column for next specification. */
@@
-731,8
+731,8
@@
fixed_parse_fortran_internal (struct fixed_parsing_state *fx,
}
else if (lex_match ('/'))
new->f.type = FMT_NEWREC;
}
else if (lex_match ('/'))
new->f.type = FMT_NEWREC;
- else if (!parse_format_specifier (&new->f,
1
)
- || !check_input_specifier (&new->f))
+ else if (!parse_format_specifier (&new->f,
FMTP_ALLOW_XT
)
+ || !check_input_specifier (&new->f
, 1
))
goto fail;
lex_match (',');
goto fail;
lex_match (',');
@@
-845,7
+845,7
@@
parse_free (struct dls_var_spec **first, struct dls_var_spec **last)
if (lex_match ('('))
{
if (!parse_format_specifier (&input, 0)
if (lex_match ('('))
{
if (!parse_format_specifier (&input, 0)
- || !check_input_specifier (&input)
+ || !check_input_specifier (&input
, 1
)
|| !lex_force_match (')'))
{
for (i = 0; i < name_cnt; i++)
|| !lex_force_match (')'))
{
for (i = 0; i < name_cnt; i++)
@@
-956,10
+956,10
@@
dump_free_table (const struct data_list_pgm *dls,
a 1-based column number indicating the beginning of the field
on success. */
static int
a 1-based column number indicating the beginning of the field
on success. */
static int
-cut_field (const struct data_list_pgm *dls, struct
len
_string *field,
+cut_field (const struct data_list_pgm *dls, struct
fixed
_string *field,
int *end_blank)
{
int *end_blank)
{
- struct
len
_string line;
+ struct
fixed
_string line;
char *cp;
size_t column_start;
char *cp;
size_t column_start;
@@
-1094,7
+1094,7
@@
read_from_data_list_fixed (const struct data_list_pgm *dls,
return -2;
for (i = 1; i <= dls->rec_cnt; i++)
{
return -2;
for (i = 1; i <= dls->rec_cnt; i++)
{
- struct
len
_string line;
+ struct
fixed
_string line;
if (dfm_eof (dls->reader))
{
if (dfm_eof (dls->reader))
{
@@
-1138,7
+1138,7
@@
read_from_data_list_free (const struct data_list_pgm *dls,
for (var_spec = dls->first; var_spec; var_spec = var_spec->next)
{
for (var_spec = dls->first; var_spec; var_spec = var_spec->next)
{
- struct
len
_string field;
+ struct
fixed
_string field;
int column;
/* Cut out a field and read in a new record if necessary. */
int column;
/* Cut out a field and read in a new record if necessary. */
@@
-1189,7
+1189,7
@@
read_from_data_list_list (const struct data_list_pgm *dls,
for (var_spec = dls->first; var_spec; var_spec = var_spec->next)
{
for (var_spec = dls->first; var_spec; var_spec = var_spec->next)
{
- struct
len
_string field;
+ struct
fixed
_string field;
int column;
/* Cut out a field and check for end-of-line. */
int column;
/* Cut out a field and check for end-of-line. */
@@
-1911,7
+1911,7
@@
repeating_data_trns_proc (struct trns_header *trns, struct ccase *c,
{
struct repeating_data_trns *t = (struct repeating_data_trns *) trns;
{
struct repeating_data_trns *t = (struct repeating_data_trns *) trns;
- struct
len
_string line; /* Current record. */
+ struct
fixed
_string line; /* Current record. */
int starts_beg; /* Starting column. */
int starts_end; /* Ending column. */
int starts_beg; /* Starting column. */
int starts_end; /* Ending column. */