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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA. */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA. */
#include <config.h>
#include "error.h"
#include <float.h>
#include <stdlib.h>
#include "alloc.h"
+#include "case.h"
#include "command.h"
#include "data-list.h"
-#include "dfm.h"
+#include "dfm-read.h"
+#include "dictionary.h"
#include "error.h"
-#include "expr.h"
+#include "expressions/public.h"
#include "file-handle.h"
#include "lexer.h"
#include "misc.h"
#include "var.h"
#include "vfm.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
#include "debug-print.h"
/* Indicates how a `union value' should be initialized. */
/* FIXME: we shouldn't do this here, but I'm afraid that other
code will check the class of vfm_source. */
- vfm_source = create_case_source (&input_program_source_class,
- default_dict, NULL);
+ vfm_source = create_case_source (&input_program_source_class, NULL);
return lex_end_of_command ();
}
/* Figure out how to initialize each input case. */
inp = xmalloc (sizeof *inp);
inp->init_cnt = dict_get_next_value_idx (default_dict);
- inp->init = xmalloc (inp->init_cnt * sizeof *inp->init);
+ inp->init = xnmalloc (inp->init_cnt, sizeof *inp->init);
for (i = 0; i < inp->init_cnt; i++)
inp->init[i] = -1;
for (i = 0; i < dict_get_var_cnt (default_dict); i++)
/* Put inp into vfm_source for later use. */
vfm_source->aux = inp;
- /* FIXME: we should use create_case_source() here. */
- vfm_source->value_cnt = dict_get_next_value_idx (default_dict);
-
return lex_end_of_command ();
}
switch (inp->init[i])
{
case INP_NUMERIC | INP_INIT_ONCE:
- c->data[i].f = 0.0;
+ case_data_rw (c, i)->f = 0.0;
break;
case INP_NUMERIC | INP_REINIT:
- c->data[i].f = SYSMIS;
+ case_data_rw (c, i)->f = SYSMIS;
break;
case INP_STRING | INP_INIT_ONCE:
case INP_STRING | INP_REINIT:
- memset (c->data[i].s, ' ', sizeof c->data[i].s);
+ memset (case_data_rw (c, i)->s, ' ', sizeof case_data_rw (c, i)->s);
break;
default:
assert (0);
case INP_NUMERIC | INP_INIT_ONCE:
break;
case INP_NUMERIC | INP_REINIT:
- c->data[i].f = SYSMIS;
+ case_data_rw (c, i)->f = SYSMIS;
break;
case INP_STRING | INP_INIT_ONCE:
break;
case INP_STRING | INP_REINIT:
- memset (c->data[i].s, ' ', sizeof c->data[i].s);
+ memset (case_data_rw (c, i)->s, ' ', sizeof case_data_rw (c, i)->s);
break;
default:
assert (0);
write_case_data wc_data)
{
struct input_program_pgm *inp = source->aux;
- int i;
+ size_t i;
/* Nonzero if there were any END CASE commands in the set of
transformations. If so, we don't automatically write out
/* Figure end_case. */
for (i = 0; i < f_trns; i++)
- if (t_trns[i]->proc == end_case_trns_proc)
+ if (t_trns[i].proc == end_case_trns_proc)
end_case = 1;
/* FIXME: This is an ugly kluge. */
for (i = 0; i < f_trns; i++)
- if (t_trns[i]->proc == repeating_data_trns_proc)
- repeating_data_set_write_case (t_trns[i], write_case, wc_data);
+ if (t_trns[i].proc == repeating_data_trns_proc)
+ repeating_data_set_write_case (t_trns[i].private, write_case, wc_data);
init_case (inp, c);
for (;;)
{
int code; /* Return value of last-called transformation. */
- if (t_trns[i]->proc == end_case_trns_proc)
+ if (t_trns[i].proc == end_case_trns_proc)
{
cases_written++;
if (!write_case (wc_data))
continue;
}
- code = t_trns[i]->proc (t_trns[i], c, cases_written + 1);
+ code = t_trns[i].proc (t_trns[i].private, c, cases_written + 1);
switch (code)
{
case -1:
int
cmd_end_case (void)
{
- struct trns_header *t;
-
if (!case_source_is_class (vfm_source, &input_program_source_class))
{
msg (SE, _("This command may only be executed between INPUT PROGRAM "
return CMD_FAILURE;
}
- t = xmalloc (sizeof *t);
- t->proc = end_case_trns_proc;
- t->free = NULL;
- add_transformation ((struct trns_header *) t);
+ add_transformation (end_case_trns_proc, NULL, NULL);
return lex_end_of_command ();
}
/* Should never be called, because this is handled in
input_program_source_read(). */
int
-end_case_trns_proc (struct trns_header *t UNUSED, struct ccase * c UNUSED,
+end_case_trns_proc (void *trns_ UNUSED, struct ccase *c UNUSED,
int case_num UNUSED)
{
assert (0);
/* REREAD transformation. */
struct reread_trns
{
- struct trns_header h;
-
- struct file_handle *handle; /* File to move file pointer back on. */
+ struct dfm_reader *reader; /* File to move file pointer back on. */
struct expression *column; /* Column to reset file pointer to. */
};
int
cmd_reread (void)
{
- /* File to be re-read. */
- struct file_handle *h;
-
- /* Expression for column to set file pointer to. */
- struct expression *e;
-
- /* Created transformation. */
- struct reread_trns *t;
+ struct file_handle *fh; /* File to be re-read. */
+ struct expression *e; /* Expression for column to set. */
+ struct reread_trns *t; /* Created transformation. */
- h = default_handle;
+ fh = fh_get_default_handle ();
e = NULL;
while (token != '.')
{
return CMD_FAILURE;
}
- e = expr_parse (EXPR_NUMERIC);
+ e = expr_parse (default_dict, EXPR_NUMBER);
if (!e)
return CMD_FAILURE;
}
else if (lex_match_id ("FILE"))
{
lex_match ('=');
- h = fh_parse_file_handle ();
- if (h == NULL)
+ fh = fh_parse (FH_REF_FILE | FH_REF_INLINE);
+ if (fh == NULL)
{
expr_free (e);
return CMD_FAILURE;
}
t = xmalloc (sizeof *t);
- t->h.proc = reread_trns_proc;
- t->h.free = reread_trns_free;
- t->handle = h;
+ t->reader = dfm_open_reader (fh);
t->column = e;
- add_transformation ((struct trns_header *) t);
+ add_transformation (reread_trns_proc, reread_trns_free, t);
return CMD_SUCCESS;
}
/* Executes a REREAD transformation. */
static int
-reread_trns_proc (struct trns_header * pt, struct ccase * c,
- int case_num)
+reread_trns_proc (void *t_, struct ccase *c, int case_num)
{
- struct reread_trns *t = (struct reread_trns *) pt;
+ struct reread_trns *t = t_;
if (t->column == NULL)
- dfm_reread_record (t->handle, 1);
+ dfm_reread_record (t->reader, 1);
else
{
- union value column;
-
- expr_evaluate (t->column, c, case_num, &column);
- if (!finite (column.f) || column.f < 1)
+ double column = expr_evaluate_num (t->column, c, case_num);
+ if (!finite (column) || column < 1)
{
msg (SE, _("REREAD: Column numbers must be positive finite "
"numbers. Column set to 1."));
- dfm_reread_record (t->handle, 1);
+ dfm_reread_record (t->reader, 1);
}
else
- dfm_reread_record (t->handle, column.f);
+ dfm_reread_record (t->reader, column);
}
return -1;
}
/* Frees a REREAD transformation. */
static void
-reread_trns_free (struct trns_header * t)
+reread_trns_free (void *t_)
{
- expr_free (((struct reread_trns *) t)->column);
+ struct reread_trns *t = t_;
+ expr_free (t->column);
+ dfm_close_reader (t->reader);
}
/* Parses END FILE command. */
int
cmd_end_file (void)
{
- struct trns_header *t;
-
if (!case_source_is_class (vfm_source, &input_program_source_class))
{
msg (SE, _("This command may only be executed between INPUT PROGRAM "
return CMD_FAILURE;
}
- t = xmalloc (sizeof *t);
- t->proc = end_file_trns_proc;
- t->free = NULL;
- add_transformation ((struct trns_header *) t);
+ add_transformation (end_file_trns_proc, NULL, NULL);
return lex_end_of_command ();
}
/* Executes an END FILE transformation. */
static int
-end_file_trns_proc (struct trns_header * t UNUSED, struct ccase * c UNUSED,
+end_file_trns_proc (void *trns_ UNUSED, struct ccase *c UNUSED,
int case_num UNUSED)
{
return -2;
projects / pspp-builds.git / blobdiff