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
/
inpt-pgm.c
diff --git
a/src/inpt-pgm.c
b/src/inpt-pgm.c
index ee2fd7cb1302c0a495a0ef26ed59a00a9e68314f..004fe2c4820b3b7e74b01118e161e8d9070ac02f 100644
(file)
--- a/
src/inpt-pgm.c
+++ b/
src/inpt-pgm.c
@@
-18,15
+18,17
@@
02111-1307, USA. */
#include <config.h>
02111-1307, USA. */
#include <config.h>
-#include
<assert.h>
+#include
"error.h"
#include <float.h>
#include <stdlib.h>
#include "alloc.h"
#include <float.h>
#include <stdlib.h>
#include "alloc.h"
+#include "case.h"
#include "command.h"
#include "data-list.h"
#include "command.h"
#include "data-list.h"
-#include "dfm.h"
+#include "dfm-read.h"
+#include "dictionary.h"
#include "error.h"
#include "error.h"
-#include "expr.h"
+#include "expr
essions/public
.h"
#include "file-handle.h"
#include "lexer.h"
#include "misc.h"
#include "file-handle.h"
#include "lexer.h"
#include "misc.h"
@@
-130,14
+132,14
@@
init_case (const struct input_program_pgm *inp, struct ccase *c)
switch (inp->init[i])
{
case INP_NUMERIC | INP_INIT_ONCE:
switch (inp->init[i])
{
case INP_NUMERIC | INP_INIT_ONCE:
- c
->data[i].
f = 0.0;
+ c
ase_data_rw (c, i)->
f = 0.0;
break;
case INP_NUMERIC | INP_REINIT:
break;
case INP_NUMERIC | INP_REINIT:
- c
->data[i].
f = SYSMIS;
+ c
ase_data_rw (c, i)->
f = SYSMIS;
break;
case INP_STRING | INP_INIT_ONCE:
case INP_STRING | INP_REINIT:
break;
case INP_STRING | INP_INIT_ONCE:
case INP_STRING | INP_REINIT:
- memset (c
->data[i].s, ' ', sizeof c->data[i].
s);
+ memset (c
ase_data_rw (c, i)->s, ' ', sizeof case_data_rw (c, i)->
s);
break;
default:
assert (0);
break;
default:
assert (0);
@@
-156,12
+158,12
@@
clear_case (const struct input_program_pgm *inp, struct ccase *c)
case INP_NUMERIC | INP_INIT_ONCE:
break;
case INP_NUMERIC | INP_REINIT:
case INP_NUMERIC | INP_INIT_ONCE:
break;
case INP_NUMERIC | INP_REINIT:
- c
->data[i].
f = SYSMIS;
+ c
ase_data_rw (c, i)->
f = SYSMIS;
break;
case INP_STRING | INP_INIT_ONCE:
break;
case INP_STRING | INP_REINIT:
break;
case INP_STRING | INP_INIT_ONCE:
break;
case INP_STRING | INP_REINIT:
- memset (c
->data[i].s, ' ', sizeof c->data[i].
s);
+ memset (c
ase_data_rw (c, i)->s, ' ', sizeof case_data_rw (c, i)->
s);
break;
default:
assert (0);
break;
default:
assert (0);
@@
-303,6
+305,7
@@
end_case_trns_proc (struct trns_header *t UNUSED, struct ccase * c UNUSED,
int case_num UNUSED)
{
assert (0);
int case_num UNUSED)
{
assert (0);
+ abort ();
}
/* REREAD transformation. */
}
/* REREAD transformation. */
@@
-310,7
+313,7
@@
struct reread_trns
{
struct trns_header h;
{
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. */
};
struct expression *column; /* Column to reset file pointer to. */
};
@@
-318,16
+321,11
@@
struct reread_trns
int
cmd_reread (void)
{
int
cmd_reread (void)
{
- /* File to be re-read. */
- struct file_handle *h;
-
- /* Expression for column to set file pointer to. */
- struct expression *e;
+ struct file_handle *fh; /* File to be re-read. */
+ struct expression *e; /* Expression for column to set. */
+ struct reread_trns *t; /* Created transformation. */
- /* Created transformation. */
- struct reread_trns *t;
-
- h = default_handle;
+ fh = default_handle;
e = NULL;
while (token != '.')
{
e = NULL;
while (token != '.')
{
@@
-342,15
+340,15
@@
cmd_reread (void)
return CMD_FAILURE;
}
return CMD_FAILURE;
}
- e = expr_parse (
PXP_NUMERIC
);
+ e = expr_parse (
default_dict, EXPR_NUMBER
);
if (!e)
return CMD_FAILURE;
}
else if (lex_match_id ("FILE"))
{
lex_match ('=');
if (!e)
return CMD_FAILURE;
}
else if (lex_match_id ("FILE"))
{
lex_match ('=');
-
h = fh_parse_file_handl
e ();
- if (h == NULL)
+
fh = fh_pars
e ();
+ if (
f
h == NULL)
{
expr_free (e);
return CMD_FAILURE;
{
expr_free (e);
return CMD_FAILURE;
@@
-367,7
+365,7
@@
cmd_reread (void)
t = xmalloc (sizeof *t);
t->h.proc = reread_trns_proc;
t->h.free = reread_trns_free;
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);
t->column = e;
add_transformation ((struct trns_header *) t);
@@
-382,29
+380,29
@@
reread_trns_proc (struct trns_header * pt, struct ccase * c,
struct reread_trns *t = (struct reread_trns *) pt;
if (t->column == NULL)
struct reread_trns *t = (struct reread_trns *) pt;
if (t->column == NULL)
- dfm_
bkwd_record (t->handle
, 1);
+ dfm_
reread_record (t->reader
, 1);
else
{
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."));
{
msg (SE, _("REREAD: Column numbers must be positive finite "
"numbers. Column set to 1."));
- dfm_
bkwd_record (t->handle
, 1);
+ dfm_
reread_record (t->reader
, 1);
}
else
}
else
- dfm_
bkwd_record (t->handle, column.f
);
+ dfm_
reread_record (t->reader, column
);
}
return -1;
}
/* Frees a REREAD transformation. */
static void
}
return -1;
}
/* Frees a REREAD transformation. */
static void
-reread_trns_free (struct trns_header *
t
)
+reread_trns_free (struct trns_header *
t_
)
{
{
- expr_free (((struct reread_trns *) t)->column);
+ struct reread_trns *t = (struct reread_trns *) t_;
+ expr_free (t->column);
+ dfm_close_reader (t->reader);
}
/* Parses END FILE command. */
}
/* Parses END FILE command. */