projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove julcal.
[pspp]
/
src
/
inpt-pgm.c
diff --git
a/src/inpt-pgm.c
b/src/inpt-pgm.c
index 697d7f5ba59726120f77492504eeeb603dc35c83..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"
@@
-50,6
+52,7
@@
struct input_program_pgm
{
enum value_init_type *init; /* How to initialize each `union value'. */
size_t init_cnt; /* Number of elements in inp_init. */
{
enum value_init_type *init; /* How to initialize each `union value'. */
size_t init_cnt; /* Number of elements in inp_init. */
+ size_t case_size; /* Size of case in bytes. */
};
static trns_proc_func end_case_trns_proc, reread_trns_proc, end_file_trns_proc;
};
static trns_proc_func end_case_trns_proc, reread_trns_proc, end_file_trns_proc;
@@
-58,11
+61,12
@@
static trns_free_func reread_trns_free;
int
cmd_input_program (void)
{
int
cmd_input_program (void)
{
- lex_match_id ("INPUT");
- lex_match_id ("PROGRAM");
discard_variables ();
discard_variables ();
- vfm_source = create_case_source (&input_program_source_class, NULL);
+ /* 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);
return lex_end_of_command ();
}
return lex_end_of_command ();
}
@@
-73,10
+77,6
@@
cmd_end_input_program (void)
struct input_program_pgm *inp;
size_t i;
struct input_program_pgm *inp;
size_t i;
- lex_match_id ("END");
- lex_match_id ("INPUT");
- lex_match_id ("PROGRAM");
-
if (!case_source_is_class (vfm_source, &input_program_source_class))
{
msg (SE, _("No matching INPUT PROGRAM command."));
if (!case_source_is_class (vfm_source, &input_program_source_class))
{
msg (SE, _("No matching INPUT PROGRAM command."));
@@
-91,7
+91,7
@@
cmd_end_input_program (void)
ordinary transformations. */
f_trns = n_trns;
ordinary transformations. */
f_trns = n_trns;
- /* Figure out how to initialize
temp_
case. */
+ /* 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 = xmalloc (sizeof *inp);
inp->init_cnt = dict_get_next_value_idx (default_dict);
inp->init = xmalloc (inp->init_cnt * sizeof *inp->init);
@@
-111,16
+111,20
@@
cmd_end_input_program (void)
}
for (i = 0; i < inp->init_cnt; i++)
assert (inp->init[i] != -1);
}
for (i = 0; i < inp->init_cnt; i++)
assert (inp->init[i] != -1);
+ inp->case_size = dict_get_case_size (default_dict);
/* Put inp into vfm_source for later use. */
vfm_source->aux = inp;
/* 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 ();
}
return lex_end_of_command ();
}
-/* Initializes
temp_case
. Called before the first case is read. */
+/* Initializes
case C
. Called before the first case is read. */
static void
static void
-init_case (
struct input_program_pgm *inp
)
+init_case (
const struct input_program_pgm *inp, struct ccase *c
)
{
size_t i;
{
size_t i;
@@
-128,23
+132,23
@@
init_case (struct input_program_pgm *inp)
switch (inp->init[i])
{
case INP_NUMERIC | INP_INIT_ONCE:
switch (inp->init[i])
{
case INP_NUMERIC | INP_INIT_ONCE:
-
temp_case->data[i].
f = 0.0;
+
case_data_rw (c, i)->
f = 0.0;
break;
case INP_NUMERIC | INP_REINIT:
break;
case INP_NUMERIC | INP_REINIT:
-
temp_case->data[i].
f = SYSMIS;
+
case_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 (
temp_case->data[i].s, ' ', sizeof temp_case->data[i].
s);
+ memset (
case_data_rw (c, i)->s, ' ', sizeof case_data_rw (c, i)->
s);
break;
default:
assert (0);
}
}
break;
default:
assert (0);
}
}
-/* Clears
temp_case
. Called between reading successive records. */
+/* Clears
case C
. Called between reading successive records. */
static void
static void
-clear_case (
struct input_program_pgm *inp
)
+clear_case (
const struct input_program_pgm *inp, struct ccase *c
)
{
size_t i;
{
size_t i;
@@
-154,12
+158,12
@@
clear_case (struct input_program_pgm *inp)
case INP_NUMERIC | INP_INIT_ONCE:
break;
case INP_NUMERIC | INP_REINIT:
case INP_NUMERIC | INP_INIT_ONCE:
break;
case INP_NUMERIC | INP_REINIT:
-
temp_case->data[i].
f = SYSMIS;
+
case_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 (
temp_case->data[i].s, ' ', sizeof temp_case->data[i].
s);
+ memset (
case_data_rw (c, i)->s, ' ', sizeof case_data_rw (c, i)->
s);
break;
default:
assert (0);
break;
default:
assert (0);
@@
-172,6
+176,7
@@
clear_case (struct input_program_pgm *inp)
return value is the index of the transformation to go to next. */
static void
input_program_source_read (struct case_source *source,
return value is the index of the transformation to go to next. */
static void
input_program_source_read (struct case_source *source,
+ struct ccase *c,
write_case_func *write_case,
write_case_data wc_data)
{
write_case_func *write_case,
write_case_data wc_data)
{
@@
-190,56
+195,43
@@
input_program_source_read (struct case_source *source,
int cases_written = 0;
assert (inp != NULL);
int cases_written = 0;
assert (inp != NULL);
-
+
/* Figure end_case. */
for (i = 0; i < f_trns; i++)
if (t_trns[i]->proc == end_case_trns_proc)
end_case = 1;
/* Figure end_case. */
for (i = 0; i < f_trns; i++)
if (t_trns[i]->proc == end_case_trns_proc)
end_case = 1;
- /* FIXME: This code should not be necessary. It is an ugly
- kluge. */
+ /* 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);
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);
- init_case (inp);
+ init_case (inp
, c
);
for (;;)
{
for (;;)
{
- /* Index of current transformation. */
- int i;
-
- /* Return value of last-called transformation. */
- int code;
-
- debug_printf (("input-program: "));
-
/* Perform transformations on `blank' case. */
/* Perform transformations on `blank' case. */
- for (i = 0; i < f_trns;)
+ for (i = 0; i < f_trns;
)
{
{
-#if DEBUGGING
- printf ("/%d", i);
- if (t_trns[i]->proc == end_case_trns_proc)
- printf ("\n");
-#endif
+ int code; /* Return value of last-called transformation. */
if (t_trns[i]->proc == end_case_trns_proc)
{
cases_written++;
if (!write_case (wc_data))
if (t_trns[i]->proc == end_case_trns_proc)
{
cases_written++;
if (!write_case (wc_data))
-
return
;
- clear_case (inp);
+
goto done
;
+ clear_case (inp
, c
);
i++;
continue;
}
i++;
continue;
}
- code = t_trns[i]->proc (t_trns[i],
temp_case
, cases_written + 1);
+ code = t_trns[i]->proc (t_trns[i],
c
, cases_written + 1);
switch (code)
{
case -1:
i++;
break;
case -2:
switch (code)
{
case -1:
i++;
break;
case -2:
-
return
;
+
goto done
;
case -3:
goto next_case;
default:
case -3:
goto next_case;
default:
@@
-248,22
+240,22
@@
input_program_source_read (struct case_source *source,
}
}
}
}
-#if DEBUGGING
- if (!end_case)
- printf ("\n");
-#endif
-
/* Write the case if appropriate. */
/* Write the case if appropriate. */
- if (!end_case)
- if (!write_case (wc_data))
- return;
+ if (!end_case)
+ {
+ cases_written++;
+ if (!write_case (wc_data))
+ break;
+ }
/* Blank out the case for the next iteration. */
next_case:
/* Blank out the case for the next iteration. */
next_case:
- clear_case (inp);
+ clear_case (inp
, c
);
}
}
+ done: ;
}
}
+/* Destroys an INPUT PROGRAM source. */
static void
input_program_source_destroy (struct case_source *source)
{
static void
input_program_source_destroy (struct case_source *source)
{
@@
-291,9
+283,6
@@
cmd_end_case (void)
{
struct trns_header *t;
{
struct trns_header *t;
- lex_match_id ("END");
- lex_match_id ("CASE");
-
if (!case_source_is_class (vfm_source, &input_program_source_class))
{
msg (SE, _("This command may only be executed between INPUT PROGRAM "
if (!case_source_is_class (vfm_source, &input_program_source_class))
{
msg (SE, _("This command may only be executed between INPUT PROGRAM "
@@
-309,11
+298,14
@@
cmd_end_case (void)
return lex_end_of_command ();
}
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,
int case_num UNUSED)
{
assert (0);
int
end_case_trns_proc (struct trns_header *t UNUSED, struct ccase * c UNUSED,
int case_num UNUSED)
{
assert (0);
+ abort ();
}
/* REREAD transformation. */
}
/* REREAD transformation. */
@@
-321,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. */
};
@@
-329,18
+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;
-
- /* Created transformation. */
- struct reread_trns *t;
-
- lex_match_id ("REREAD");
+ 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;
+
f
h = default_handle;
e = NULL;
while (token != '.')
{
e = NULL;
while (token != '.')
{
@@
-355,21
+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 ('=');
- if (token != T_ID)
- {
- lex_error (_("expecting file handle name"));
- expr_free (e);
- return CMD_FAILURE;
- }
- h = fh_get_handle_by_name (tokid);
- if (!h)
+ fh = fh_parse ();
+ if (fh == NULL)
{
expr_free (e);
return CMD_FAILURE;
{
expr_free (e);
return CMD_FAILURE;
@@
-386,13
+365,14
@@
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);
return CMD_SUCCESS;
}
t->column = e;
add_transformation ((struct trns_header *) t);
return CMD_SUCCESS;
}
+/* Executes a REREAD transformation. */
static int
reread_trns_proc (struct trns_header * pt, struct ccase * c,
int case_num)
static int
reread_trns_proc (struct trns_header * pt, struct ccase * c,
int case_num)
@@
-400,28
+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;
}
}
return -1;
}
+/* Frees a REREAD transformation. */
static void
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. */
@@
-430,9
+411,6
@@
cmd_end_file (void)
{
struct trns_header *t;
{
struct trns_header *t;
- lex_match_id ("END");
- lex_match_id ("FILE");
-
if (!case_source_is_class (vfm_source, &input_program_source_class))
{
msg (SE, _("This command may only be executed between INPUT PROGRAM "
if (!case_source_is_class (vfm_source, &input_program_source_class))
{
msg (SE, _("This command may only be executed between INPUT PROGRAM "
@@
-448,12
+426,10
@@
cmd_end_file (void)
return lex_end_of_command ();
}
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,
int case_num UNUSED)
{
static int
end_file_trns_proc (struct trns_header * t UNUSED, struct ccase * c UNUSED,
int case_num UNUSED)
{
-#if DEBUGGING
- printf ("END FILE\n");
-#endif
return -2;
}
return -2;
}