X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Finpt-pgm.c;h=ef9c3646440cc889c8d0fcd2fee0e93ee927bd28;hb=1195caf0c998e80d3e7195a0452a14e7b4194077;hp=697d7f5ba59726120f77492504eeeb603dc35c83;hpb=bc963dae9be291ea0a7cccf189d13e00d3797cfd;p=pspp-builds.git diff --git a/src/inpt-pgm.c b/src/inpt-pgm.c index 697d7f5b..ef9c3646 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" @@ -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. */ + size_t case_size; /* Size of case in bytes. */ }; static trns_proc_func end_case_trns_proc, reread_trns_proc, end_file_trns_proc; @@ -58,10 +61,10 @@ static trns_free_func reread_trns_free; int cmd_input_program (void) { - lex_match_id ("INPUT"); - lex_match_id ("PROGRAM"); discard_variables (); + /* 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,10 +76,6 @@ 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 (!case_source_is_class (vfm_source, &input_program_source_class)) { msg (SE, _("No matching INPUT PROGRAM command.")); @@ -91,7 +90,7 @@ cmd_end_input_program (void) 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); @@ -111,6 +110,7 @@ cmd_end_input_program (void) } 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; @@ -118,9 +118,9 @@ cmd_end_input_program (void) 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 (struct input_program_pgm *inp) +init_case (const struct input_program_pgm *inp, struct ccase *c) { size_t i; @@ -128,23 +128,23 @@ init_case (struct input_program_pgm *inp) 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 (struct input_program_pgm *inp) +clear_case (const struct input_program_pgm *inp, struct ccase *c) { size_t i; @@ -154,12 +154,12 @@ clear_case (struct input_program_pgm *inp) 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); @@ -172,6 +172,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, + struct ccase *c, write_case_func *write_case, write_case_data wc_data) { @@ -190,56 +191,43 @@ input_program_source_read (struct case_source *source, 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; - /* 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); - init_case (inp); + 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) { cases_written++; if (!write_case (wc_data)) - return; - clear_case (inp); + goto done; + clear_case (inp, c); 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: - return; + goto done; case -3: goto next_case; default: @@ -248,22 +236,22 @@ input_program_source_read (struct case_source *source, } } -#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 (inp); + clear_case (inp, c); } + done: ; } +/* Destroys an INPUT PROGRAM source. */ static void input_program_source_destroy (struct case_source *source) { @@ -291,9 +279,6 @@ cmd_end_case (void) { 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 " @@ -309,11 +294,14 @@ cmd_end_case (void) 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); + abort (); } /* REREAD transformation. */ @@ -321,7 +309,7 @@ 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. */ }; @@ -329,18 +317,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; - - 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; + fh = default_handle; e = NULL; while (token != '.') { @@ -355,21 +336,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; @@ -386,13 +361,14 @@ 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); return CMD_SUCCESS; } +/* Executes a REREAD transformation. */ static int reread_trns_proc (struct trns_header * pt, struct ccase * c, int case_num) @@ -400,28 +376,29 @@ reread_trns_proc (struct trns_header * pt, struct ccase * c, 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 { - 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_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 (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. */ @@ -430,9 +407,6 @@ cmd_end_file (void) { 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 " @@ -448,12 +422,10 @@ cmd_end_file (void) 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) { -#if DEBUGGING - printf ("END FILE\n"); -#endif return -2; }