#include <config.h>
#include "data-list.h"
-#include <assert.h>
+#include "error.h"
#include <ctype.h>
#include <float.h>
#include <stdio.h>
#include <stdlib.h>
#include "alloc.h"
+#include "case.h"
#include "command.h"
#include "data-in.h"
#include "debug-print.h"
-#include "dfm.h"
+#include "dfm-read.h"
+#include "dictionary.h"
#include "error.h"
#include "file-handle.h"
#include "format.h"
struct trns_header h;
struct dls_var_spec *first, *last; /* Variable parsing specifications. */
- struct file_handle *handle; /* Input file, never NULL. */
+ struct dfm_reader *reader; /* Data file reader. */
int type; /* A DLS_* constant. */
struct variable *end; /* Variable specified on END subcommand. */
int eof; /* End of file encountered. */
- int nrec; /* Number of records. */
+ int rec_cnt; /* Number of records. */
size_t case_size; /* Case size in bytes. */
+ char *delims; /* Delimiters if any; not null-terminated. */
+ size_t delim_cnt; /* Number of delimiter, or 0 for spaces. */
};
static int parse_fixed (struct data_list_pgm *);
static int parse_free (struct dls_var_spec **, struct dls_var_spec **);
-static void dump_fixed_table (const struct dls_var_spec *specs,
- const struct file_handle *handle, int nrec);
-static void dump_free_table (const struct data_list_pgm *);
+static void dump_fixed_table (const struct dls_var_spec *,
+ const struct file_handle *, int rec_cnt);
+static void dump_free_table (const struct data_list_pgm *,
+ const struct file_handle *);
static void destroy_dls_var_spec (struct dls_var_spec *);
static trns_free_func data_list_trns_free;
static trns_proc_func data_list_trns_proc;
int
cmd_data_list (void)
{
- /* DATA LIST program under construction. */
- struct data_list_pgm *dls;
-
- /* 0=print no table, 1=print table. (TABLE subcommand.) */
- int table = -1;
-
- lex_match_id ("DATA");
- lex_match_id ("LIST");
+ struct data_list_pgm *dls; /* DATA LIST program under construction. */
+ int table = -1; /* Print table if nonzero, -1=undecided. */
+ struct file_handle *fh = NULL; /* File handle of source, NULL=inline file. */
if (!case_source_is_complex (vfm_source))
discard_variables ();
dls = xmalloc (sizeof *dls);
- dls->handle = default_handle;
+ dls->reader = NULL;
dls->type = -1;
dls->end = NULL;
dls->eof = 0;
- dls->nrec = 0;
+ dls->rec_cnt = 0;
+ dls->delims = NULL;
+ dls->delim_cnt = 0;
dls->first = dls->last = NULL;
while (token != '/')
if (lex_match_id ("FILE"))
{
lex_match ('=');
- dls->handle = fh_parse_file_handle ();
- if (!dls->handle)
+ fh = fh_parse ();
+ if (fh == NULL)
goto error;
if (case_source_is_class (vfm_source, &file_type_source_class)
- && dls->handle != default_handle)
+ && fh != default_handle)
{
msg (SE, _("DATA LIST may not use a different file from "
"that specified on its surrounding FILE TYPE."));
lex_match ('(');
if (!lex_force_int ())
goto error;
- dls->nrec = lex_integer ();
+ dls->rec_cnt = lex_integer ();
lex_get ();
lex_match (')');
}
}
else if (token == T_ID)
{
- /* Must match DLS_* constants. */
- static const char *id[] = {"FIXED", "FREE", "LIST", "NOTABLE",
- "TABLE", NULL};
- const char **p;
- int index;
-
- for (p = id; *p; p++)
- if (lex_id_match (*p, tokid))
- break;
- if (*p == NULL)
- {
- lex_error (NULL);
- goto error;
- }
-
- lex_get ();
+ if (lex_match_id ("NOTABLE"))
+ table = 0;
+ else if (lex_match_id ("TABLE"))
+ table = 1;
+ else
+ {
+ int type;
+ if (lex_match_id ("FIXED"))
+ type = DLS_FIXED;
+ else if (lex_match_id ("FREE"))
+ type = DLS_FREE;
+ else if (lex_match_id ("LIST"))
+ type = DLS_LIST;
+ else
+ {
+ lex_error (NULL);
+ goto error;
+ }
- index = p - id;
- if (index < 3)
- {
if (dls->type != -1)
{
msg (SE, _("Only one of FIXED, FREE, or LIST may "
- "be specified."));
+ "be specified."));
goto error;
}
-
- dls->type = index;
- }
- else
- table = index - 3;
- }
+ dls->type = type;
+
+ if ((dls->type == DLS_FREE || dls->type == DLS_LIST)
+ && lex_match ('('))
+ {
+ while (!lex_match (')'))
+ {
+ int delim;
+
+ if (lex_match_id ("TAB"))
+ delim = '\t';
+ else if (token == T_STRING && tokstr.length == 1)
+ {
+ delim = tokstr.string[0];
+ lex_get();
+ }
+ else
+ {
+ lex_error (NULL);
+ goto error;
+ }
+
+ dls->delims = xrealloc (dls->delims, dls->delim_cnt + 1);
+ dls->delims[dls->delim_cnt++] = delim;
+
+ lex_match (',');
+ }
+ }
+ }
+ }
else
{
lex_error (NULL);
}
dls->case_size = dict_get_case_size (default_dict);
- default_handle = dls->handle;
+ default_handle = fh;
if (dls->type == -1)
dls->type = DLS_FIXED;
if (!parse_fixed (dls))
goto error;
if (table)
- dump_fixed_table (dls->first, dls->handle, dls->nrec);
+ dump_fixed_table (dls->first, fh, dls->rec_cnt);
}
else
{
if (!parse_free (&dls->first, &dls->last))
goto error;
if (table)
- dump_free_table (dls);
+ dump_free_table (dls, fh);
}
+ dls->reader = dfm_open_reader (fh);
+ if (dls->reader == NULL)
+ goto error;
+
if (vfm_source != NULL)
{
struct data_list_pgm *new_pgm;
error:
destroy_dls_var_spec (dls->first);
+ free (dls->delims);
free (dls);
return CMD_FAILURE;
}
msg (SE, _("At least one variable must be specified."));
return 0;
}
- if (dls->nrec && dls->last->rec > dls->nrec)
+ if (dls->rec_cnt && dls->last->rec > dls->rec_cnt)
{
msg (SE, _("Variables are specified on records that "
"should not exist according to RECORDS subcommand."));
return 0;
}
- else if (!dls->nrec)
- dls->nrec = dls->last->rec;
+ else if (!dls->rec_cnt)
+ dls->rec_cnt = dls->last->rec;
if (token != '.')
{
lex_error (_("expecting end of command"));
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. */
}
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 (',');
ending column. */
static void
dump_fixed_table (const struct dls_var_spec *specs,
- const struct file_handle *handle, int nrec)
+ const struct file_handle *fh, int rec_cnt)
{
const struct dls_var_spec *spec;
struct tab_table *t;
- char *buf;
- const char *filename;
int i;
for (i = 0, spec = specs; spec; spec = spec->next)
fmt_to_string (&spec->input));
}
- filename = fh_handle_name (handle);
- if (filename == NULL)
- filename = "";
- buf = local_alloc (strlen (filename) + INT_DIGITS + 80);
- sprintf (buf, (handle != inline_file
- ? ngettext ("Reading %d record from file %s.",
- "Reading %d records from file %s.", nrec)
- : ngettext ("Reading %d record from the command file.",
- "Reading %d records from the command file.",
- nrec)),
- nrec, filename);
-
- tab_title (t, 0, buf);
+ if (fh != NULL)
+ tab_title (t, 1, ngettext ("Reading %d record from file %s.",
+ "Reading %d records from file %s.", rec_cnt),
+ rec_cnt, handle_get_filename (fh));
+ else
+ tab_title (t, 1, ngettext ("Reading %d record from the command file.",
+ "Reading %d records from the command file.",
+ rec_cnt),
+ rec_cnt);
tab_submit (t);
- fh_handle_name (NULL);
- local_free (buf);
}
\f
/* Free-format parsing. */
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++)
input.type = FMT_F;
input.w = 8;
input.d = 0;
- output = set_format;
+ output = get_format();
}
if (input.type == FMT_A || input.type == FMT_AHEX)
/* Displays a table giving information on free-format variable parsing
on DATA LIST. */
static void
-dump_free_table (const struct data_list_pgm *dls)
+dump_free_table (const struct data_list_pgm *dls,
+ const struct file_handle *fh)
{
struct tab_table *t;
int i;
tab_text (t, 1, i, TAB_LEFT | TAT_FIX, fmt_to_string (&spec->input));
}
}
-
- {
- const char *filename;
-
- filename = fh_handle_name (dls->handle);
- if (filename == NULL)
- filename = "";
- tab_title (t, 1,
- (dls->handle != inline_file
- ? _("Reading free-form data from file %s.")
- : _("Reading free-form data from the command file.")),
- filename);
- }
+
+ if (fh != NULL)
+ tab_title (t, 1, _("Reading free-form data from file %s."),
+ handle_get_filename (fh));
+ else
+ tab_title (t, 1, _("Reading free-form data from the command file."));
tab_submit (t);
- fh_handle_name (NULL);
}
\f
/* Input procedure. */
-/* Extracts a field from the current position in the current record.
- Fields can be unquoted or quoted with single- or double-quote
- characters. *RET_LEN is set to the field length, *RET_CP is set to
- the field itself. After parsing the field, sets the current
- position in the record to just past the field. Returns 0 on
- failure or a 1-based column number indicating the beginning of the
- field on success. */
+/* Extracts a field from the current position in the current
+ record. Fields can be unquoted or quoted with single- or
+ double-quote characters. *FIELD is set to the field content.
+ After parsing the field, sets the current position in the
+ record to just past the field and any trailing delimiter.
+ END_BLANK is used internally; it should be initialized by the
+ caller to 0 and left alone afterward. Returns 0 on failure or
+ a 1-based column number indicating the beginning of the field
+ on success. */
static int
-cut_field (const struct data_list_pgm *dls, char **ret_cp, int *ret_len)
+cut_field (const struct data_list_pgm *dls, struct fixed_string *field,
+ int *end_blank)
{
- char *cp, *ep;
- int len;
-
- cp = dfm_get_record (dls->handle, &len);
- if (!cp)
- return 0;
-
- ep = cp + len;
+ struct fixed_string line;
+ char *cp;
+ size_t column_start;
- /* Skip leading whitespace and commas. */
- while ((isspace ((unsigned char) *cp) || *cp == ',') && cp < ep)
- cp++;
- if (cp >= ep)
+ if (dfm_eof (dls->reader))
return 0;
+ if (dls->delim_cnt == 0)
+ dfm_expand_tabs (dls->reader);
+ dfm_get_record (dls->reader, &line);
- /* Three types of fields: quoted with ', quoted with ", unquoted. */
- if (*cp == '\'' || *cp == '"')
+ cp = ls_c_str (&line);
+ if (dls->delim_cnt == 0)
{
- int quote = *cp;
-
- *ret_cp = ++cp;
- while (cp < ep && *cp != quote)
- cp++;
- *ret_len = cp - *ret_cp;
- if (cp < ep)
- cp++;
+ /* Skip leading whitespace. */
+ while (cp < ls_end (&line) && isspace ((unsigned char) *cp))
+ cp++;
+ if (cp >= ls_end (&line))
+ return 0;
+
+ /* Handle actual data, whether quoted or unquoted. */
+ if (*cp == '\'' || *cp == '"')
+ {
+ int quote = *cp;
+
+ field->string = ++cp;
+ while (cp < ls_end (&line) && *cp != quote)
+ cp++;
+ field->length = cp - field->string;
+ if (cp < ls_end (&line))
+ cp++;
+ else
+ msg (SW, _("Quoted string missing terminating `%c'."), quote);
+ }
else
- msg (SW, _("Scope of string exceeds line."));
+ {
+ field->string = cp;
+ while (cp < ls_end (&line)
+ && !isspace ((unsigned char) *cp) && *cp != ',')
+ cp++;
+ field->length = cp - field->string;
+ }
+
+ /* Skip trailing whitespace and a single comma if present. */
+ while (cp < ls_end (&line) && isspace ((unsigned char) *cp))
+ cp++;
+ if (cp < ls_end (&line) && *cp == ',')
+ cp++;
}
- else
+ else
{
- *ret_cp = cp;
- while (cp < ep && !isspace ((unsigned char) *cp) && *cp != ',')
- cp++;
- *ret_len = cp - *ret_cp;
+ if (cp >= ls_end (&line))
+ {
+ int column = dfm_column_start (dls->reader);
+ /* A blank line or a line that ends in \t has a
+ trailing blank field. */
+ if (column == 1 || (column > 1 && cp[-1] == '\t'))
+ {
+ if (*end_blank == 0)
+ {
+ *end_blank = 1;
+ field->string = ls_end (&line);
+ field->length = 0;
+ dfm_forward_record (dls->reader);
+ return column;
+ }
+ else
+ {
+ *end_blank = 0;
+ return 0;
+ }
+ }
+ else
+ return 0;
+ }
+ else
+ {
+ field->string = cp;
+ while (cp < ls_end (&line)
+ && memchr (dls->delims, *cp, dls->delim_cnt) == NULL)
+ cp++;
+ field->length = cp - field->string;
+ if (cp < ls_end (&line))
+ cp++;
+ }
}
-
- {
- int beginning_column;
-
- dfm_set_record (dls->handle, *ret_cp);
- beginning_column = dfm_get_cur_col (dls->handle) + 1;
+
+ dfm_forward_columns (dls->reader, field->string - line.string);
+ column_start = dfm_column_start (dls->reader);
- dfm_set_record (dls->handle, cp);
+ dfm_forward_columns (dls->reader, cp - field->string);
- return beginning_column;
- }
+ return column_start;
}
typedef int data_list_read_func (const struct data_list_pgm *, struct ccase *);
default:
assert (0);
+ abort ();
}
}
struct dls_var_spec *var_spec = dls->first;
int i;
- if (!dfm_get_record (dls->handle, NULL))
+ if (dfm_eof (dls->reader))
return -2;
- for (i = 1; i <= dls->nrec; i++)
+ for (i = 1; i <= dls->rec_cnt; i++)
{
- int len;
- char *line = dfm_get_record (dls->handle, &len);
+ struct fixed_string line;
- if (!line)
+ if (dfm_eof (dls->reader))
{
/* Note that this can't occur on the first record. */
msg (SW, _("Partial case of %d of %d records discarded."),
- i - 1, dls->nrec);
+ i - 1, dls->rec_cnt);
return -2;
}
+ dfm_expand_tabs (dls->reader);
+ dfm_get_record (dls->reader, &line);
for (; var_spec && i == var_spec->rec; var_spec = var_spec->next)
{
struct data_in di;
- data_in_finite_line (&di, line, len, var_spec->fc, var_spec->lc);
- di.v = &c->data[var_spec->fv];
+ data_in_finite_line (&di, ls_c_str (&line), ls_length (&line),
+ var_spec->fc, var_spec->lc);
+ di.v = case_data_rw (c, var_spec->fv);
di.flags = 0;
di.f1 = var_spec->fc;
di.format = var_spec->input;
data_in (&di);
}
- dfm_fwd_record (dls->handle);
+ dfm_forward_record (dls->reader);
}
return -1;
struct ccase *c)
{
struct dls_var_spec *var_spec;
- char *field;
- int len;
+ int end_blank = 0;
for (var_spec = dls->first; var_spec; var_spec = var_spec->next)
{
+ struct fixed_string field;
int column;
/* Cut out a field and read in a new record if necessary. */
for (;;)
{
- column = cut_field (dls, &field, &len);
+ column = cut_field (dls, &field, &end_blank);
if (column != 0)
break;
- if (dfm_get_record (dls->handle, NULL))
- dfm_fwd_record (dls->handle);
- if (!dfm_get_record (dls->handle, NULL))
+ if (!dfm_eof (dls->reader))
+ dfm_forward_record (dls->reader);
+ if (dfm_eof (dls->reader))
{
if (var_spec != dls->first)
msg (SW, _("Partial case discarded. The first variable "
- "missing was %s."), var_spec->name);
+ "missing was %s."), var_spec->name);
return -2;
}
}
{
struct data_in di;
- di.s = field;
- di.e = field + len;
- di.v = &c->data[var_spec->fv];
+ di.s = ls_c_str (&field);
+ di.e = ls_end (&field);
+ di.v = case_data_rw (c, var_spec->fv);
di.flags = 0;
di.f1 = column;
di.format = var_spec->input;
struct ccase *c)
{
struct dls_var_spec *var_spec;
- char *field;
- int len;
+ int end_blank = 0;
- if (!dfm_get_record (dls->handle, NULL))
+ if (dfm_eof (dls->reader))
return -2;
for (var_spec = dls->first; var_spec; var_spec = var_spec->next)
{
+ struct fixed_string field;
+ int column;
+
/* Cut out a field and check for end-of-line. */
- int column = cut_field (dls, &field, &len);
-
+ column = cut_field (dls, &field, &end_blank);
if (column == 0)
{
- if (set_undefined)
+ if (get_undefined ())
msg (SW, _("Missing value(s) for all variables from %s onward. "
- "These will be filled with the system-missing value "
- "or blanks, as appropriate."),
+ "These will be filled with the system-missing value "
+ "or blanks, as appropriate."),
var_spec->name);
- for (; var_spec; var_spec = var_spec->next)
+ for (; var_spec; var_spec = var_spec->next)
{
int width = get_format_var_width (&var_spec->input);
if (width == 0)
- c->data[var_spec->fv].f = SYSMIS;
+ case_data_rw (c, var_spec->fv)->f = SYSMIS;
else
- memset (c->data[var_spec->fv].s, ' ', width);
+ memset (case_data_rw (c, var_spec->fv)->s, ' ', width);
}
break;
}
{
struct data_in di;
- di.s = field;
- di.e = field + len;
- di.v = &c->data[var_spec->fv];
+ di.s = ls_c_str (&field);
+ di.e = ls_end (&field);
+ di.v = case_data_rw (c, var_spec->fv);
di.flags = 0;
di.f1 = column;
di.format = var_spec->input;
}
}
- dfm_fwd_record (dls->handle);
+ dfm_forward_record (dls->reader);
return -1;
}
data_list_trns_free (struct trns_header *pgm)
{
struct data_list_pgm *dls = (struct data_list_pgm *) pgm;
+ free (dls->delims);
destroy_dls_var_spec (dls->first);
- fh_close_handle (dls->handle);
+ dfm_close_reader (dls->reader);
free (pgm);
}
data_list_read_func *read_func;
int retval;
- dfm_push (dls->handle);
+ dfm_push (dls->reader);
read_func = get_data_list_read_func (dls);
retval = read_func (dls, c);
{
msg (SE, _("Attempt to read past end of file."));
err_failure ();
- dfm_pop (dls->handle);
+ dfm_pop (dls->reader);
return -2;
}
{
if (retval == -2)
{
- c->data[dls->end->fv].f = 1.0;
+ case_data_rw (c, dls->end->fv)->f = 1.0;
retval = -1;
}
else
- c->data[dls->end->fv].f = 0.0;
+ case_data_rw (c, dls->end->fv)->f = 0.0;
}
- dfm_pop (dls->handle);
+ dfm_pop (dls->reader);
return retval;
}
struct data_list_pgm *dls = source->aux;
data_list_read_func *read_func = get_data_list_read_func (dls);
- dfm_push (dls->handle);
+ dfm_push (dls->reader);
while (read_func (dls, c) != -2)
if (!write_case (wc_data))
break;
- dfm_pop (dls->handle);
-
- fh_close_handle (dls->handle);
+ dfm_pop (dls->reader);
}
/* Destroys the source's internal data. */
{
struct trns_header h;
struct dls_var_spec *first, *last; /* Variable parsing specifications. */
- struct file_handle *handle; /* Input file, never NULL. */
+ struct dfm_reader *reader; /* Input file, never NULL. */
struct rpd_num_or_var starts_beg; /* STARTS=, before the dash. */
struct rpd_num_or_var starts_end; /* STARTS=, after the dash. */
cmd_repeating_data (void)
{
struct repeating_data_trns *rpd;
-
- /* 0=print no table, 1=print table. (TABLE subcommand.) */
- int table = 1;
-
- /* Bits are set when a particular subcommand has been seen. */
- unsigned seen = 0;
+ int table = 1; /* Print table? */
+ unsigned seen = 0; /* Mark subcommands as already seen. */
+ struct file_handle *const fh = default_handle;
- lex_match_id ("REPEATING");
- lex_match_id ("DATA");
-
assert (case_source_is_complex (vfm_source));
rpd = xmalloc (sizeof *rpd);
- rpd->handle = default_handle;
+ rpd->reader = dfm_open_reader (default_handle);
rpd->first = rpd->last = NULL;
rpd->starts_beg.num = 0;
rpd->starts_beg.var = NULL;
{
if (lex_match_id ("FILE"))
{
+ struct file_handle *file;
lex_match ('=');
- rpd->handle = fh_parse_file_handle ();
- if (!rpd->handle)
+ file = fh_parse ();
+ if (file == NULL)
goto error;
- if (rpd->handle != default_handle)
+ if (file != fh)
{
msg (SE, _("REPEATING DATA must use the same file as its "
"corresponding DATA LIST or FILE TYPE."));
/* Calculate starts_end, cont_end if necessary. */
if (rpd->starts_end.num == 0 && rpd->starts_end.var == NULL)
- rpd->starts_end.num = fh_record_width (rpd->handle);
+ rpd->starts_end.num = handle_get_record_width (fh);
if (rpd->cont_end.num == 0 && rpd->starts_end.var == NULL)
- rpd->cont_end.num = fh_record_width (rpd->handle);
+ rpd->cont_end.num = handle_get_record_width (fh);
/* Calculate length if possible. */
if ((seen & 4) == 0)
goto error;
if (table)
- dump_fixed_table (rpd->first, rpd->handle, rpd->last->rec);
+ dump_fixed_table (rpd->first, fh, rpd->last->rec);
{
struct repeating_data_trns *new_trns;
assert (n->num == 0);
if (n->var != NULL)
{
- double v = c->data[n->var->fv].f;
+ double v = case_num (c, n->var->fv);
if (v == SYSMIS || v <= INT_MIN || v >= INT_MAX)
return -1;
struct data_in di;
data_in_finite_line (&di, info->line, info->len, fc, lc);
- di.v = &info->c->data[var_spec->fv];
+ di.v = case_data_rw (info->c, var_spec->fv);
di.flags = 0;
di.f1 = fc + 1;
di.format = var_spec->input;
{
struct repeating_data_trns *t = (struct repeating_data_trns *) trns;
- char *line; /* Current record. */
- int len; /* Length of current record. */
+ struct fixed_string line; /* Current record. */
int starts_beg; /* Starting column. */
int starts_end; /* Ending column. */
int occurs; /* Number of repetitions. */
int length; /* Length of each occurrence. */
- int cont_beg; /* Starting column for continuation lines. */
- int cont_end; /* Ending column for continuation lines. */
+ int cont_beg; /* Starting column for continuation lines. */
+ int cont_end; /* Ending column for continuation lines. */
int occurs_left; /* Number of occurrences remaining. */
int skip_first_record = 0;
- dfm_push (t->handle);
+ dfm_push (t->reader);
/* Read the current record. */
- dfm_bkwd_record (t->handle, 1);
- line = dfm_get_record (t->handle, &len);
- if (line == NULL)
+ dfm_reread_record (t->reader, 1);
+ dfm_expand_tabs (t->reader);
+ if (dfm_eof (t->reader))
return -2;
- dfm_fwd_record (t->handle);
+ dfm_get_record (t->reader, &line);
+ dfm_forward_record (t->reader);
/* Calculate occurs, length. */
occurs_left = occurs = realize_value (&t->occurs, c);
{
struct rpd_parse_info info;
info.trns = t;
- info.line = line;
- info.len = len;
+ info.line = ls_c_str (&line);
+ info.len = ls_length (&line);
info.beg = starts_beg;
info.end = starts_end;
info.ofs = length;
assert (occurs_left >= 0);
/* Read in another record. */
- line = dfm_get_record (t->handle, &len);
- if (line == NULL)
+ if (dfm_eof (t->reader))
{
tmsg (SE, RPD_ERR,
_("Unexpected end of file with %d repetitions "
occurs_left, occurs);
return -2;
}
- dfm_fwd_record (t->handle);
+ dfm_expand_tabs (t->reader);
+ dfm_get_record (t->reader, &line);
+ dfm_forward_record (t->reader);
/* Parse this record. */
info.trns = t;
- info.line = line;
- info.len = len;
+ info.line = ls_c_str (&line);
+ info.len = ls_length (&line);
info.beg = cont_beg;
info.end = cont_end;
info.ofs = length;
occurs_left -= code;
}
- dfm_pop (t->handle);
+ dfm_pop (t->reader);
/* FIXME: This is a kluge until we've implemented multiplexing of
transformations. */
struct repeating_data_trns *rpd = (struct repeating_data_trns *) rpd_;
destroy_dls_var_spec (rpd->first);
- fh_close_handle (rpd->handle);
+ dfm_close_reader (rpd->reader);
free (rpd->id_value);
}
projects / pspp-builds.git / blobdiff