X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Finpt-pgm.c;h=eaa19532eaef4b80ecf2921dafaaa3b0efde03e0;hb=e210b20bf6f405637c8c03dd280b5a4a627191b8;hp=425c9362931336491abd4641e4f175a4c178af94;hpb=312ad23d59e643e0c72e7ad684b00f3432461dee;p=pspp-builds.git diff --git a/src/inpt-pgm.c b/src/inpt-pgm.c index 425c9362..eaa19532 100644 --- a/src/inpt-pgm.c +++ b/src/inpt-pgm.c @@ -14,19 +14,21 @@ 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 -#include +#include "error.h" #include #include #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" @@ -34,6 +36,9 @@ #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. */ @@ -46,26 +51,24 @@ enum value_init_type INP_REINIT = 0, /* Reinitialize for each iteration. */ }; -/* Array that tells INPUT PROGRAM how to initialize each `union - value'. */ -static enum value_init_type *inp_init; - -/* Number of bytes allocated for inp_init. */ -static size_t inp_nval; +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. */ + size_t case_size; /* Size of case in bytes. */ + }; -static int end_case_trns_proc (struct trns_header *, struct ccase *); -static int end_file_trns_proc (struct trns_header * t, struct ccase * c); -static int reread_trns_proc (struct trns_header *, struct ccase *); -static void reread_trns_free (struct trns_header *); +static trns_proc_func end_case_trns_proc, reread_trns_proc, end_file_trns_proc; +static trns_free_func reread_trns_free; int cmd_input_program (void) { - lex_match_id ("INPUT"); - lex_match_id ("PROGRAM"); discard_variables (); - vfm_source = &input_program_source; + /* 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, NULL); return lex_end_of_command (); } @@ -73,13 +76,10 @@ cmd_input_program (void) int cmd_end_input_program (void) { + struct input_program_pgm *inp; size_t i; - lex_match_id ("END"); - lex_match_id ("INPUT"); - lex_match_id ("PROGRAM"); - - if (vfm_source != &input_program_source) + if (!case_source_is_class (vfm_source, &input_program_source_class)) { msg (SE, _("No matching INPUT PROGRAM command.")); return CMD_FAILURE; @@ -89,15 +89,16 @@ cmd_end_input_program (void) msg (SW, _("No data-input or transformation commands specified " "between INPUT PROGRAM and END INPUT PROGRAM.")); - /* Mark the boundary between INPUT PROGRAM and more-mundane - transformations. */ + /* Mark the boundary between INPUT PROGRAM transformations and + ordinary transformations. */ f_trns = n_trns; - /* Figure out how to initialize temp_case. */ - inp_nval = dict_get_next_value_idx (default_dict); - inp_init = xmalloc (inp_nval * sizeof *inp_init); - for (i = 0; i < inp_nval; i++) - inp_init[i] = -1; + /* Figure out how to initialize each input case. */ + inp = xmalloc (sizeof *inp); + inp->init_cnt = dict_get_next_value_idx (default_dict); + 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++) { struct variable *var = dict_get_var (default_dict, i); @@ -108,56 +109,60 @@ cmd_end_input_program (void) value_init |= var->reinit ? INP_REINIT : INP_INIT_ONCE; for (j = 0; j < var->nv; j++) - inp_init[j + var->fv] = value_init; + inp->init[j + var->fv] = value_init; } - for (i = 0; i < inp_nval; 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; 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 -init_case (void) +init_case (const struct input_program_pgm *inp, struct ccase *c) { size_t i; - for (i = 0; i < inp_nval; i++) - switch (inp_init[i]) + for (i = 0; i < inp->init_cnt; i++) + 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: - 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: - 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); } } -/* Clears temp_case. Called between reading successive records. */ +/* Clears case C. Called between reading successive records. */ static void -clear_case (void) +clear_case (const struct input_program_pgm *inp, struct ccase *c) { size_t i; - for (i = 0; i < inp_nval; i++) - switch (inp_init[i]) + for (i = 0; i < inp->init_cnt; i++) + switch (inp->init[i]) { 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: - 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); @@ -169,64 +174,63 @@ clear_case (void) file. -1 means go on to the next transformation. Otherwise the return value is the index of the transformation to go to next. */ static void -input_program_source_read (write_case_func *write_case, +input_program_source_read (struct case_source *source, + struct ccase *c, + write_case_func *write_case, write_case_data wc_data) { - int i; + struct input_program_pgm *inp = source->aux; + size_t i; /* Nonzero if there were any END CASE commands in the set of - transformations. */ + transformations. If so, we don't automatically write out + cases. */ int end_case = 0; - /* We don't automatically write out cases if the user took over - that prerogative. */ + /* FIXME? This is the number of cases sent out of the input + program, not the number of cases written to the procedure. + The difference should only show up in $CASENUM in COMPUTE. + We should check behavior against SPSS. */ + 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) + 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); + if (t_trns[i].proc == repeating_data_trns_proc) + repeating_data_set_write_case (t_trns[i].private, write_case, wc_data); - init_case (); + init_case (inp, c); for (;;) { - /* Index of current transformation. */ - int i; - - /* Return value of last-called transformation. */ - int code; - - debug_printf (("input-program: ")); - /* 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) + if (t_trns[i].proc == end_case_trns_proc) { + cases_written++; if (!write_case (wc_data)) - return; - clear_case (); + goto done; + clear_case (inp, c); i++; continue; } - code = t_trns[i]->proc (t_trns[i], temp_case); + code = t_trns[i].proc (t_trns[i].private, c, cases_written + 1); switch (code) { case -1: i++; break; case -2: - return; + goto done; case -3: goto next_case; default: @@ -235,76 +239,73 @@ input_program_source_read (write_case_func *write_case, } } -#if DEBUGGING - if (!end_case) - printf ("\n"); -#endif - /* 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: - clear_case (); + clear_case (inp, c); } + done: ; } +/* Destroys an INPUT PROGRAM source. */ static void -input_program_source_destroy_source (void) +input_program_source_destroy (struct case_source *source) { + struct input_program_pgm *inp = source->aux; + cancel_transformations (); - free (inp_init); - inp_init = NULL; + + if (inp != NULL) + { + free (inp->init); + free (inp); + } } -struct case_stream input_program_source = +const struct case_source_class input_program_source_class = { + "INPUT PROGRAM", NULL, input_program_source_read, - NULL, - NULL, - input_program_source_destroy_source, - NULL, - "INPUT PROGRAM", + input_program_source_destroy, }; int cmd_end_case (void) { - struct trns_header *t; - - lex_match_id ("END"); - lex_match_id ("CASE"); - - if (vfm_source != &input_program_source) + if (!case_source_is_class (vfm_source, &input_program_source_class)) { msg (SE, _("This command may only be executed between INPUT PROGRAM " "and END 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); + abort (); } /* 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. */ }; @@ -312,18 +313,11 @@ struct reread_trns 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. */ - lex_match_id ("REREAD"); - - h = default_handle; + fh = default_handle; e = NULL; while (token != '.') { @@ -338,21 +332,15 @@ cmd_reread (void) 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 (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; @@ -367,74 +355,65 @@ cmd_reread (void) } 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) +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_bkwd_record (t->handle, 1); + dfm_reread_record (t->reader, 1); else { - union value column; - - expr_evaluate (t->column, c, &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_bkwd_record (t->handle, 1); + dfm_reread_record (t->reader, 1); } else - dfm_bkwd_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; - - lex_match_id ("END"); - lex_match_id ("FILE"); - - if (vfm_source != &input_program_source) + if (!case_source_is_class (vfm_source, &input_program_source_class)) { msg (SE, _("This command may only be executed between INPUT PROGRAM " "and END 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) { -#if DEBUGGING - printf ("END FILE\n"); -#endif return -2; }