X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Finpt-pgm.c;h=99cc17a0fb1a4927fddba0ee17138ee158c95057;hb=9e24f9a5c52650da0700066e8d9e72261c6492ad;hp=de8b810052671d9997d6cbdbea76988f00574c94;hpb=2be9bee9da6a2ce27715e58128569594319abfa2;p=pspp-builds.git diff --git a/src/language/data-io/inpt-pgm.c b/src/language/data-io/inpt-pgm.c index de8b8100..99cc17a0 100644 --- a/src/language/data-io/inpt-pgm.c +++ b/src/language/data-io/inpt-pgm.c @@ -92,7 +92,7 @@ cmd_input_program (struct lexer *lexer, struct dataset *ds) struct input_program_pgm *inp; bool saw_END_CASE = false; - proc_discard_active_file (ds); + dataset_clear (ds); if (!lex_match (lexer, T_ENDCMD)) return lex_end_of_command (lexer); @@ -117,7 +117,7 @@ cmd_input_program (struct lexer *lexer, struct dataset *ds) if (result == CMD_EOF) msg (SE, _("Unexpected end-of-file within INPUT PROGRAM.")); inside_input_program = false; - proc_discard_active_file (ds); + dataset_clear (ds); destroy_input_program (inp); return result; } @@ -129,7 +129,7 @@ cmd_input_program (struct lexer *lexer, struct dataset *ds) if (dict_get_next_value_idx (dataset_dict (ds)) == 0) { msg (SE, _("Input program did not create any variables.")); - proc_discard_active_file (ds); + dataset_clear (ds); destroy_input_program (inp); return CMD_FAILURE; } @@ -144,7 +144,7 @@ cmd_input_program (struct lexer *lexer, struct dataset *ds) caseinit_mark_for_init (inp->init, dataset_dict (ds)); inp->proto = caseproto_ref (dict_get_proto (dataset_dict (ds))); - proc_set_active_file_data ( + dataset_set_source ( ds, casereader_create_sequential (NULL, inp->proto, CASENUMBER_MAX, &input_program_casereader_class, inp));