X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Finpt-pgm.c;h=462289987b4044c7568272abdab35a0a4b5cd687;hb=c1a56a1dd2afad462cf76d91c40aa064cc7dce04;hp=97fbbf1e134f4643bf6f0b3adf37a2148c23e28f;hpb=92c09e564002d356d20fc1e2e131027ef89f6748;p=pspp diff --git a/src/language/data-io/inpt-pgm.c b/src/language/data-io/inpt-pgm.c index 97fbbf1e13..462289987b 100644 --- a/src/language/data-io/inpt-pgm.c +++ b/src/language/data-io/inpt-pgm.c @@ -1,20 +1,18 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. 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., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include @@ -35,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -43,11 +40,13 @@ #include #include +#include "xalloc.h" + #include "gettext.h" #define _(msgid) gettext (msgid) /* Private result codes for use within INPUT PROGRAM. */ -enum cmd_result_extensions +enum cmd_result_extensions { CMD_END_INPUT_PROGRAM = CMD_PRIVATE_FIRST, CMD_END_CASE @@ -58,20 +57,20 @@ enum value_init_type { INP_NUMERIC = 01, /* Numeric. */ INP_STRING = 0, /* String. */ - + INP_INIT_ONCE = 02, /* Initialize only once. */ INP_REINIT = 0, /* Reinitialize for each iteration. */ }; -struct input_program_pgm +struct input_program_pgm { struct trns_chain *trns_chain; enum trns_result restart; - size_t case_nr; /* Incremented by END CASE transformation. */ + casenumber case_nr; /* Incremented by END CASE transformation. */ struct caseinit *init; - size_t value_cnt; + struct caseproto *proto; }; static void destroy_input_program (struct input_program_pgm *); @@ -87,14 +86,14 @@ static bool inside_input_program; /* Returns true if we're parsing the inside of a INPUT PROGRAM...END INPUT PROGRAM construct, false otherwise. */ bool -in_input_program (void) +in_input_program (void) { return inside_input_program; } /* Emits an END CASE transformation for INP. */ static void -emit_END_CASE (struct dataset *ds, struct input_program_pgm *inp) +emit_END_CASE (struct dataset *ds, struct input_program_pgm *inp) { add_transformation (ds, end_case_trns_proc, NULL, inp); } @@ -112,17 +111,18 @@ cmd_input_program (struct lexer *lexer, struct dataset *ds) inp = xmalloc (sizeof *inp); inp->trns_chain = NULL; inp->init = NULL; - + inp->proto = NULL; + inside_input_program = true; - for (;;) + for (;;) { enum cmd_result result = cmd_parse_in_state (lexer, ds, CMD_STATE_INPUT_PROGRAM); if (result == CMD_END_INPUT_PROGRAM) break; - else if (result == CMD_END_CASE) + else if (result == CMD_END_CASE) { emit_END_CASE (ds, inp); - saw_END_CASE = true; + saw_END_CASE = true; } else if (cmd_result_is_failure (result) && result != CMD_FAILURE) { @@ -138,14 +138,14 @@ cmd_input_program (struct lexer *lexer, struct dataset *ds) emit_END_CASE (ds, inp); inside_input_program = false; - if (dict_get_next_value_idx (dataset_dict (ds)) == 0) + if (dict_get_next_value_idx (dataset_dict (ds)) == 0) { msg (SE, _("Input program did not create any variables.")); proc_discard_active_file (ds); destroy_input_program (inp); return CMD_FAILURE; } - + inp->trns_chain = proc_capture_transformations (ds); trns_chain_finalize (inp->trns_chain); @@ -154,10 +154,10 @@ cmd_input_program (struct lexer *lexer, struct dataset *ds) /* Figure out how to initialize each input case. */ inp->init = caseinit_create (); caseinit_mark_for_init (inp->init, dataset_dict (ds)); - inp->value_cnt = dict_get_next_value_idx (dataset_dict (ds)); - + inp->proto = caseproto_ref (dict_get_proto (dataset_dict (ds))); + proc_set_active_file_data ( - ds, casereader_create_sequential (NULL, inp->value_cnt, CASENUMBER_MAX, + ds, casereader_create_sequential (NULL, inp->proto, CASENUMBER_MAX, &input_program_casereader_class, inp)); return CMD_SUCCESS; @@ -167,13 +167,13 @@ int cmd_end_input_program (struct lexer *lexer UNUSED, struct dataset *ds UNUSED) { assert (in_input_program ()); - return CMD_END_INPUT_PROGRAM; + return CMD_END_INPUT_PROGRAM; } /* Returns true if STATE is valid given the transformations that are allowed within INPUT PROGRAM. */ static bool -is_valid_state (enum trns_result state) +is_valid_state (enum trns_result state) { return (state == TRNS_CONTINUE || state == TRNS_ERROR @@ -181,45 +181,44 @@ is_valid_state (enum trns_result state) || state >= 0); } -/* Reads one case into C. - Returns true if successful, false at end of file or if an +/* Reads and returns one case. + Returns the case if successful, null at end of file or if an I/O error occurred. */ -static bool -input_program_casereader_read (struct casereader *reader UNUSED, void *inp_, - struct ccase *c) +static struct ccase * +input_program_casereader_read (struct casereader *reader UNUSED, void *inp_) { struct input_program_pgm *inp = inp_; - - case_create (c, inp->value_cnt); + struct ccase *c = case_create (inp->proto); do { assert (is_valid_state (inp->restart)); - if (inp->restart == TRNS_ERROR || inp->restart == TRNS_END_FILE) + if (inp->restart == TRNS_ERROR || inp->restart == TRNS_END_FILE) { - case_destroy (c); - return false; + case_unref (c); + return NULL; } - caseinit_init_reinit_vars (inp->init, c); - caseinit_init_left_vars (inp->init, c); + c = case_unshare (c); + caseinit_init_vars (inp->init, c); inp->restart = trns_chain_execute (inp->trns_chain, inp->restart, - c, &inp->case_nr); + &c, inp->case_nr); assert (is_valid_state (inp->restart)); caseinit_update_left_vars (inp->init, c); } while (inp->restart < 0); - return true; + return c; } static void -destroy_input_program (struct input_program_pgm *pgm) +destroy_input_program (struct input_program_pgm *pgm) { - if (pgm != NULL) + if (pgm != NULL) { trns_chain_destroy (pgm->trns_chain); caseinit_destroy (pgm->init); + caseproto_unref (pgm->proto); free (pgm); } } @@ -253,7 +252,7 @@ cmd_end_case (struct lexer *lexer, struct dataset *ds UNUSED) /* Outputs the current case */ int -end_case_trns_proc (void *inp_, struct ccase *c UNUSED, +end_case_trns_proc (void *inp_, struct ccase **c UNUSED, casenumber case_nr UNUSED) { struct input_program_pgm *inp = inp_; @@ -283,14 +282,14 @@ cmd_reread (struct lexer *lexer, struct dataset *ds) if (lex_match_id (lexer, "COLUMN")) { lex_match (lexer, '='); - + if (e) { msg (SE, _("COLUMN subcommand multiply specified.")); expr_free (e); return CMD_CASCADING_FAILURE; } - + e = expr_parse (lexer, ds, EXPR_NUMBER); if (!e) return CMD_CASCADING_FAILURE; @@ -298,6 +297,7 @@ cmd_reread (struct lexer *lexer, struct dataset *ds) else if (lex_match_id (lexer, "FILE")) { lex_match (lexer, '='); + fh_unref (fh); fh = fh_parse (lexer, FH_REF_FILE | FH_REF_INLINE); if (fh == NULL) { @@ -318,12 +318,13 @@ cmd_reread (struct lexer *lexer, struct dataset *ds) t->column = e; add_transformation (ds, reread_trns_proc, reread_trns_free, t); + fh_unref (fh); return CMD_SUCCESS; } /* Executes a REREAD transformation. */ static int -reread_trns_proc (void *t_, struct ccase *c, casenumber case_num) +reread_trns_proc (void *t_, struct ccase **c, casenumber case_num) { struct reread_trns *t = t_; @@ -331,8 +332,8 @@ reread_trns_proc (void *t_, struct ccase *c, casenumber case_num) dfm_reread_record (t->reader, 1); else { - double column = expr_evaluate_num (t->column, c, case_num); - if (!finite (column) || column < 1) + double column = expr_evaluate_num (t->column, *c, case_num); + if (!isfinite (column) || column < 1) { msg (SE, _("REREAD: Column numbers must be positive finite " "numbers. Column set to 1.")); @@ -368,7 +369,7 @@ cmd_end_file (struct lexer *lexer, struct dataset *ds) /* Executes an END FILE transformation. */ static int -end_file_trns_proc (void *trns_ UNUSED, struct ccase *c UNUSED, +end_file_trns_proc (void *trns_ UNUSED, struct ccase **c UNUSED, casenumber case_num UNUSED) { return TRNS_END_FILE;