1 2007-12-07 Ben Pfaff <blp@gnu.org>
5 * data-parser.c (data_parser_make_active_file): Fix case count
6 argument to casereader_create_sequential, which fixes data reading
8 Provided by John Darrington.
10 2007-12-04 Ben Pfaff <blp@gnu.org>
12 Move DATA LIST parsing into generic infrastructure, and generalize
13 it slightly. Then, use the same infrastructure to implement GET
16 * data-parser.c: New file.
18 * data-parser.h: New file.
20 * data-list.c (struct dls_var_spec): Removed.
21 (ll_to_dls_var_spec): Removed.
22 (enum dls_type): Removed.
23 (struct data_list_pgm): Rename struct data_list_trns. Remove
24 pool, specs, type, record_cnt, delims, skip_records, value_cnt
25 members. Add new `parser' member.
26 (cmd_data_list): Use data-parser infrastructure.
29 (dump_fixed_table): Removed.
30 (dump_free_table): Removed.
32 (read_from_data_list): Removed.
33 (read_from_data_list_fixed): Removed.
34 (read_from_data_list_free): Removed.
35 (read_from_data_list_list): Removed.
36 (data_list_trns_free): Rename arguments for clarity.
37 (data_list_trns_proc): Ditto.
38 (data_list_casereader_read): Removed.
39 (data_list_casereader_destroy): Removed.
40 (data_list_casereader_class): Removed.
42 * get-data.c (cmd_get_data): Support TXT type.
43 (set_type): New function.
44 (parse_get_txt): New function.
46 2007-12-04 Ben Pfaff <blp@gnu.org>
48 * placement-parser.c (parse_column): New function.
49 (parse_column_range): Add `base' argument. Update all callers.
51 2007-12-04 Ben Pfaff <blp@gnu.org>
53 Make GET DATA a separate command, instead of something invoked
56 * automake.mk: Remove get-data.h from sources.
58 * get-data.h: Removed.
60 * get-data.c (parse_get_data_command): Rename cmd_get_data.
62 * get.c (parse_read_command): No longer any need to check for DATA
65 2007-12-04 Ben Pfaff <blp@gnu.org>
67 * src/language/data-io/data-reader.c (struct dfm_reader): New
68 `file_size' member to support dfm_get_percent_read.
69 (dfm_open_reader): Initialize file_size.
70 (dfm_get_percent_read): New function.
72 2007-11-08 Ben Pfaff <blp@gnu.org>
74 Patch #6256: add support for binary, 360 file formats. Reviewed
77 * data-reader.c (struct dfm_reader): New member `block_left'.
78 (dfm_open_reader): Initialize block_left. For FH_MODE_TEXT, open
79 the file in text mode.
80 (read_error): New function.
81 (partial_record): New function.
82 (try_to_read_fully): New function.
83 (enum descriptor_type): New enum.
84 (read_descriptor_word): New function.
85 (corrupt_size): New function.
86 (read_size): New function.
87 (read_file_record): Implement new modes.
88 (read_record): Now take care of tracking line numbers here.
89 (dfm_reader_get_legacy_encoding): New function.
91 * data-writer.c (dfm_put_record): Implement new modes.
92 (dfm_writer_get_legacy_encoding): New function.
94 * file-handle.q: Parse new formats.
95 (cmd_file_handle): Set up new formats.
97 * print.c (struct print_trns): New member `encoding'.
98 (internal_cmd_print): Set encoding.
99 (print_trns_proc): Recode output data if necessary.
100 (flush_records): Recode leader byte.
102 2007-11-03 Ben Pfaff <blp@gnu.org>
104 Allow output files to overwrite input files (bug #21280).
106 * data-list.c (cmd_data_list): Manage file handle reference
109 * data-reader.c (struct dfm_reader): Add `lock' member.
110 (dfm_close_reader): Simplify, as reference counting is now
111 separate from locking.
112 (dfm_open_reader): Lock file.
114 * data-writer.c (struct dfm_writer): Add fh_lock, replace_file
116 (dfm_open_writer): Lock file and prepare for replacement.
117 (dfm_close_writer): Unlock file and replace it.
119 * file-handle.q (cmd_close_file_handle): Use fh_unname.
120 (fh_parse): Don't distinguish existing handles for a given file
121 name from new ones. Manage file handle reference counts.
123 * get.c (parse_read_command): Manage file handle reference counts.
124 (parse_write_command): Ditto.
125 (mtf_close_all_files): Ditto.
127 * inpt-pgm.c (cmd_reread): Manage file handle reference counts.
129 * print-space.c (cmd_print_space): Manage file handle reference
132 * print.c (internal_cmd_print): Manage file handle reference
135 2007-11-03 John Darrington <john@darrington.wattle.id.au>
137 * get.c: Add GET DATA command variant.
139 * get-data.c get-data.h (new files): Added support for
140 GET DATA /TYPE='gnm' command.
142 2007-09-23 Ben Pfaff <blp@gnu.org>
144 Bug #21111. Reviewed by John Darrington.
146 * data-list.c (data_list_trns_proc): Properly set retval when END
147 subcommand is in use.
148 (cmd_data_list): Don't allow END subcommand to be used with DATA
151 2007-09-12 Ben Pfaff <blp@gnu.org>
153 * get.c (get_translate_case): Change input case parameter from
154 const struct ccase * to struct ccase *, to match change in
155 casereader and casewriter translators. Destroy input case, to fix
158 2007-08-12 Ben Pfaff <blp@gnu.org>
160 * get.c (parse_read_command): Compact the values in the target
161 dictionary, to save space.
163 2007-08-12 Ben Pfaff <blp@gnu.org>
165 * get.c (struct case_map): Move into new file src/data/case-map.c.
166 (start_case_map): Ditto, and rename case_map_prepare_dict.
167 (finish_case_map): Ditto, and rename case_map_from_dict.
168 (map_case): Ditto, and rename case_map_execute.
169 (destroy_case_map): Ditto, and rename case_map_destroy.
170 (case_map_get_value_cnt): Ditto.
172 2007-08-12 Ben Pfaff <blp@gnu.org>
174 * get.c (case_map_get_value_cnt): New function.
176 2007-07-25 Ben Pfaff <blp@gnu.org>
179 * data-list.c (read_from_data_list_fixed): Handle multi-record
182 2007-07-11 Ben Pfaff <blp@gnu.org>
184 * get.c (map_case): Create destination case instead of leaving it
185 undefined. Fixes bug #20285.
186 Reviewed by John Darrington.
188 2007-06-06 Ben Pfaff <blp@gnu.org>
190 * get.c: Essentially rewrite MATCH FILES to support FIRST and
193 2007-06-06 Ben Pfaff <blp@gnu.org>
195 Adapt case sources, sinks, and clients of procedure code to the
198 * data-list.c: Make DATA LIST into a casereader.
200 * get.c: Change GET, IMPORT, SAVE, EXPORT to use casereaders,
203 * inpt-pgm.c: Use caseinit code. Turn INPUT PROGRAM into a
206 * list.q: Adapt to new procedure code.
208 2007-05-06 Ben Pfaff <blp@gnu.org>
210 Abstract the documents within a dictionary a little better.
211 Thanks to John Darrington for suggestion, initial version, and
214 * get.c (mtf_merge_dictionary): Simplify creating merged document.
216 * sys-file-info.c (display_documents): Use new
217 dict_get_document_line_cnt and dict_get_document_line functions.
219 Thu Feb 1 16:56:02 2007 Ben Pfaff <blp@gnu.org>
221 * file-handle.q (fh_parse): Update to new fh_create_file
224 Sat Dec 16 22:16:18 2006 Ben Pfaff <blp@gnu.org>
226 Make it possible to pull cases from the active file with a
227 function call, instead of requiring indirection through a callback
230 * automake.mk: Removed matrix-data.c.
232 * matrix-data.c: Removed.
234 * data-list.c (data_list_source_read): Conform with new
235 case_source_class interface.
236 (data_list_source_destroy): Ditto.
238 * get.c (case_reader_source_class): Ditto.
239 (case_reader_source_destroy): Ditto.
240 (parse_output_proc): Take advantage of new procedure interface.
241 (output_proc): Removed.
242 (struct mtf_file): Add "struct ccase *" member to allow use of new
244 (cmd_match_files): Take advantage of new procedure interface.
245 (mtf_processing_finish): Removed.
246 (mtf_read_nonactive_records): Renamed mtf_read_records. Now reads
247 from every file, without any exception for the active file.
248 (mtf_compare_BY_values): Simplify for new interface.
249 (mtf_processing): Simplify for new interface.
251 * inpt-pgm.c (is_valid_state): New function.
252 (input_program_source_read): Conform with new case_source_class
254 (input_program_source_destroy): Ditto.
255 (end_case_trns_proc): Now just needs to return TRNS_END_CASE.
257 Sat Dec 9 18:43:34 2006 Ben Pfaff <blp@gnu.org>
259 * list.q (cmd_list): Use new var_create, var_destroy functions.
261 Thu Nov 30 21:51:58 2006 Ben Pfaff <blp@gnu.org>
263 * inpt-pgm.c (cmd_reread): Always return error code upon detecting
264 syntax error. Fixes bug #18419. Thanks to John Darrington for
267 Sun Nov 19 09:17:45 2006 Ben Pfaff <blp@gnu.org>
269 * data-list.c (parse_free): Follow documented (but odd) rule that
270 N format is treated as F format for free-field input.
272 * data-reader.c (read_file_record): Drop new-line character from
273 input text lines. This is symmetrical with the recently changed
274 dfm_put_record semantics.
276 Thu Nov 2 20:56:03 2006 Ben Pfaff <blp@gnu.org>
278 Implement SKIP keyword on DATA LIST. Fixes bug #17099.
280 * data-list.c: (struct data_list_pgm) Add `skip_records' members.
281 (cmd_data_list) Set skip_records based on user input.
282 (data_list_source_read) Skip records requested by user.
284 Tue Oct 31 20:04:06 2006 Ben Pfaff <blp@gnu.org>
286 * placement-parser.c: (PRS_TYPE_T) Now that struct fmt_spec uses
287 an enum fmt_type for its type member, we can't depend on the
288 ability to put negative values into that member as out-of-band
289 values, because enum fmt_type might be an unsigned type. So use
290 values around SCHAR_MAX instead, because we know that SCHAR_MAX
291 will fit into any type, signed or unsigned, and there aren't
292 nearly that many format types.
293 (parse_var_placements) Add for_input parameter to specify whether
294 we're parsing input or output formats. Update all callers.
295 (fixed_parse_columns) Ditto.
296 (fixed_parse_fortran) Ditto.
298 Tue Oct 31 18:21:48 2006 Ben Pfaff <blp@gnu.org>
300 * print-space.c (print_space_trns_proc): Let dfm_put_record add
301 the new-line character, to match dfm_put_record change below.
303 Sat Oct 28 11:57:19 2006 Ben Pfaff <blp@gnu.org>
305 * data-writer.c (struct dfm_writer): Removed `bounce' member, and
306 all references to it.
307 (dfm_put_record) Change semantics so that it adds formatting
308 itself, such as new-line characters, instead of putting that
309 responsibility on the caller. Also, pad binary records with
310 spaces instead of zeros, for compatibility.
312 * print.c (struct prt_out_spec) New member `sysmis_as_spaces'.
313 (struct print_trns) Remove `omit_new_lines' and all references,
314 since dfm_put_record() is taking care of that. Add
316 (internal_cmd_print) Allow an empty set of data to print. Set
318 (parse_specs) Allow an empty set of data to print.
319 (parse_variable_argument) Only add space with PRINT command. Set
321 (print_trns_proc) Indent records if include_prefix is set, for
322 compatibility. Output SYSMIS as spaces if sysmis_as_spaces is
323 set. Put "1" in first column if PRINT EJECT is used with an
324 external output file.
325 (flush_records) Ditto.
327 Sat Oct 28 16:19:57 WST 2006 John Darrington <john@darrington.wattle.id.au>
329 * data-reader.c: Eliminated references to extern variable getl_buf
331 Sat Aug 5 08:25:07 2006 Ben Pfaff <blp@gnu.org>
333 Fix bug #17329 in REREAD parsing, reported by John Darrington.
335 * inpt-pgm.c (cmd_reread): Fix file handle parsing.
337 Mon Jul 31 10:32:31 2006 Ben Pfaff <blp@gnu.org>
339 * print.c (parse_specs): Allow a comma between specifications.
341 Sun Jul 16 19:57:10 2006 Ben Pfaff <blp@gnu.org>
343 * automake.mk: (src_language_data_io_libdata_io_a_SOURCE) Add
344 print-space.c, placement-parser.c, placement-parser.h.
346 * data-list.c: Basically rewrote the whole thing. Broke out a lot
347 of code into placement-parser.c. Code is much cleaner now.
349 * placement-parser.c: New file.
351 * placement-parser.h: New file.
353 * print.c: Basically rewrote the whole thing. Broke out PRINT
354 SPACE into print-space.c. Code is much cleaner now.
356 * print-space.c: New file.
358 Sat Jul 1 17:39:40 2006 Ben Pfaff <blp@gnu.org>
360 Fix bug #11612, "q2c documentation does not agree with code".
362 * list.q: Audit use of q2c "+" prefixes that indicate that a
363 command may appear multiple times.
365 Sat Jul 1 20:44:22 2006 Ben Pfaff <blp@gnu.org>
367 Fix bug #15786: System File Creation crashes if directoy is
370 * get.c (parse_write_command): Check that the any_writer open
373 Tue Jun 27 22:44:28 2006 Ben Pfaff <blp@gnu.org>
375 Fix regression in command name completion reported by John
376 Darrington. Now completion is again state-dependent and occurs
377 only on the first line of a command.
379 * inpt-pgm.c: (cmd_input_program) Reading of first token in
380 command moved into cmd_parse.
382 Fri Jun 9 13:56:00 2006 Ben Pfaff <blp@gnu.org>
384 Reform string library.
386 * matrix-data.c (context): Use dynamic string.
387 (another_token) Deal with changed dfm_get_record() interface.
391 * data-list.c (struct data_list_pgm) Delete delims, delim_cnt
392 members, replacing them by struct string delims. Update all
393 references to use struct string functions.
394 (cut_field) Change interface to avoid needing "end_blank", by
395 getting the data-reader to remember that state for us. Change
396 internals to use substring. Update both callers.
398 * data-reader.c (read_file_record): Use ds_read_stream().
399 (dfm_get_record) Change interface to return substring. Updated
401 (dfm_expand_tabs) Use ds_find_char(). Now maintain position
402 relative to end-of-line. Use ds_swap().
403 (dfm_reread_record) Don't limit position by line length.
404 (dfm_column_start) Make parameter const.
405 (dfm_columns_past_end) New function.
406 (dfm_get_column) New function.
408 Thu May 25 18:26:26 WST 2006 John Darrington <john@darrington.wattle.id.au>
410 * print.c (print_trns_free): Made the code agree with the comment, by
411 not freeing PRT. Has the side effect that the command no longer
412 crashes on invalid syntax.
414 Tue May 9 20:55:46 2006 Ben Pfaff <blp@gnu.org>
416 * get.c (cmd_match_files): Fix memory leak replacing default_dict.
418 Sat May 6 22:25:09 2006 Ben Pfaff <blp@gnu.org>
422 * list.q (write_fallback_headers): (write_fallback_headers)
423 Properly record width of leader and pass it to write_varname().
425 Sat May 6 19:03:13 2006 Ben Pfaff <blp@gnu.org>
427 * get.c: (mtf_merge_dictionary) Fix value label memory leak.
429 Sat May 6 13:51:16 2006 Ben Pfaff <blp@gnu.org>
431 Use a casefile, instead of a case sink, for MATCH FILES output.
432 It's more straightforward, although it has the same effect.
434 * get.c: (struct mtf_proc) Replace `sink' case sink member by
435 `output' casefile member.
436 (cmd_match_files) Work with casefile instead of sink.
437 (mtf_processing) Add case to casefile instead of sink.
439 Sat May 6 10:43:07 2006 Ben Pfaff <blp@gnu.org>
441 Continue reforming procedure execution. In this phase, get rid of
442 the output code for SPLIT FILE groups in procedure.c, which really
443 shouldn't be doing any output. Move it into the individual
444 procedures instead. This also adds some flexibility.
446 * list.q (write_all_headers): Call output_split_file_values().
448 Wed May 3 23:00:17 2006 Ben Pfaff <blp@gnu.org>
450 Continue reforming procedure execution. In this phase, get rid of
451 many global variables, consolidating procedure execution in
452 procedure.c. Encapsulate transformations in new "struct
453 trns_chain". Also, change implementation of N OF CASES, FILTER,
454 and PROCESS IF from special cases to transformations.
456 * data-list.c: (data_list_trns_proc) Return TRNS_END_FILE at end
457 of file. (Why didn't we do this before?)
458 (cmd_match_files) Direct procedure output to null sink.
459 Use discard_variables() instead of indirect version.
461 * inpt-pgm.c: Use transformation chain.
462 (struct input_program_pgm) Add trns_chain member.
463 (cmd_input_program) Initialize trns_chain member and capture
464 transformations with proc_capture_transformations().
465 (input_program_source_read) Use trns_chain_execute().
466 (destroy_input_program) Destroy input chain.
468 Tue May 2 10:39:56 WST 2006 John Darrington <john@darrington.wattle.id.au>
470 * list.q Changed from using fixed length char buffers to struct
471 string so that any length variables can be used.
473 Mon May 1 18:21:19 2006 Ben Pfaff <blp@gnu.org>
475 Further clean up the CMD_* command result codes.
477 * (enum cmd_result_extensions) New. Add CMD_END_INPUT_PROGRAM and
478 CMD_END_CASE result codes.
479 (struct input_program_pgm) Added case_nr, write_case, wc_data
480 members for use by END CASE transformation.
481 (emit_END_CASE) New function.
482 (cmd_input_program) Interpret CMD_END_CASE by outputting an END
483 CASE transformation. If none is output by the input program
484 itself, add one automatically at the end. Change lack of
485 variables from warning to error.
486 (cmd_end_input_program) Return CMD_END_INPUT_PROGRAM instead of
488 (input_program_source_read) No longer any need to special-case END
489 CASE. Handle TRNS_DROP_CASE properly. Initialize new members in
490 inp for use by END CASE transformation.
491 (destroy_input_program) New function.
492 (input_program_source_destroy) Just call destroy_input_program().
493 (cmd_end_case) Just return CMD_END_CASE.
494 (end_case_trns_proc) No longer a stub handled by
495 input_program_source_read(). Actually output the case and
496 increment the case number.
498 Mon May 1 16:06:30 2006 Ben Pfaff <blp@gnu.org>
500 Remove vestiges of REPEATING DATA support.
502 * data-list.c: (struct rpd_num_or_var) Removed.
503 (struct repeating_data_trns) Removed.
504 (cmd_repeating_data) Removed.
505 (find_variable_input_spec) Removed.
506 (parse_num_or_var) Removed.
507 (parse_repeating_data) Removed.
508 (realize_value) Removed.
509 (struct rpd_parse_info) Removed.
510 (rpd_parse_record) Removed.
511 (repeating_data_trns_proc) Removed.
512 (repeating_data_trns_free) Removed.
513 (repeating_data_set_write_case) Removed.
516 * inpt-pgm.c: (input_program_source_read) Don't deal with
519 * data-list.h: Removed.
521 * automake.mk (src_language_data_io_libdata_io_a_SOURCES): Removed
524 Mon May 1 15:58:28 2006 Ben Pfaff <blp@gnu.org>
526 Remove vestiges of FILE TYPE support.
528 * data-list.c: (cmd_data_list) Don't check for FILE TYPE.
529 (cmd_repeating_data) Ditto.
531 * automake.mk (src_language_data_io_libdata_io_a_SOURCES): Remove
532 file-type.c, file-type.h.
534 * file-type.c: Removed.
536 * file-type.h: Removed.
538 Wed Apr 26 13:16:28 2006 Ben Pfaff <blp@gnu.org>
540 Improve the way we handle the various parsing "states". Until now
541 we've hard-coded the state transitions in the command definition
542 file, but that's error-prone and, worse, it's redundant--we can
543 figure out what state we're in anyhow. We can cleanly handle
544 INPUT PROGRAM and FILE TYPE with a nested command-processing loop.
546 * data-list.c: (cmd_data_list) Use in_file_type() or
547 in_input_program() in place of case_source_is_class() or
548 case_source_is_complex().
550 * file-type.c: NB: Not really fixed except minimally to compile,
551 because it doesn't work anyway.
552 (in_file_type) New function.
553 (cmd_record_type) No need to check that we're in FILE TYPE.
554 (cmd_end_file_type) Ditto.
555 (var file_type_source_class) Make static.
557 * get.c: (cmd_match_files) Check vfm_source instead of pgm_state.
559 * inpt-pgm.c: (in_input_program) New function.
560 (cmd_input_program) Rewrite to include nested command processing
562 (cmd_end_input_program) Just return CMD_END_SUBLOOP.
563 (var input_program_source_class) Make static.
564 (cmd_end_case) No need to check that we're in INPUT PROGRAM.
565 (cmd_end_file) Ditto.
567 * automake.mk (src_language_data_io_libdata_io_a_SOURCES): Add
568 file-type.h, inpt-pgm.h.
570 * file-type.h: New file.
572 * inpt-pgm.h: New file.
574 Tue Apr 25 13:11:55 2006 Ben Pfaff <blp@gnu.org>
576 * print.c: Don't special-case MS-DOS line terminators.
577 (macro LINE_END_WIDTH) Removed.
578 (alloc_line) Line ends are 1 byte.
579 (print_trns_proc) Just output \n for line end.
581 Sun Apr 23 22:05:58 2006 Ben Pfaff <blp@gnu.org>
583 Continue reforming error message support. In this phase, get rid
584 of message "titles" and put the message text in `struct error'.
585 Now `struct error' encapsulates a message more properly.
587 * data-list.c: (macro RPD_ERR) Removed.
588 (rpd_msg) New function. Updated all references to tmsg() to call
589 this function instead.
591 Sat Apr 15 19:38:13 2006 Ben Pfaff <blp@gnu.org>
593 Remove last users of struct file_ext so we can get rid of it
596 * data-reader.c: (struct dfm_reader) Change file member from
597 struct file_ext to FILE *. Updated all references.
598 (dfm_close_reader) Close file with fn_close() instead of
599 fn_close_ext(). Also, make a copy of the file name from the file
600 handle before closing it, because we can't extract it after we
602 (dfm_open_reader) Open file with fn_open() instead of
605 * data-writer.c: (struct dfm_writer) Change file member
606 struct file_ext to FILE *. Updated all references.
607 (dfm_close_writer) Close file with fn_close() instead of
608 fn_close_ext(). Also, make a copy of the file name from the file
609 handle before closing it, because we can't extract it after we
611 (dfm_open_writer) Open file with fn_open() instead of
614 Sat Apr 15 18:00:32 2006 Ben Pfaff <blp@gnu.org>
616 * data-list.c: Add prototype to suppress warning for
617 cmd_repeating_data().
619 Thu Mar 2 08:40:33 WST 2006 John Darrington <john@darrington.wattle.id.au>
621 * Moved files from src directory