1 2008-05-15 Ben Pfaff <blp@gnu.org>
5 * inpt-pgm.c (reread_trns_proc): Use gsl_finite instead of finite,
6 as a stopgap measure for portability until appropriate gnulib
9 2008-02-06 John Darrington <john@darrington.wattle.id.au>
11 * get-data.c: Add a /BSIZE subcommand to PSQL reader.
13 2008-02-02 John Darrington <john@darrington.wattle.id.au>
15 * get-data.c (cmd_get_data): Support PSQL type.
17 2007-12-07 Ben Pfaff <blp@gnu.org>
21 * data-parser.c (data_parser_make_active_file): Fix case count
22 argument to casereader_create_sequential, which fixes data reading
24 Provided by John Darrington.
26 2007-12-04 Ben Pfaff <blp@gnu.org>
28 Move DATA LIST parsing into generic infrastructure, and generalize
29 it slightly. Then, use the same infrastructure to implement GET
32 * data-parser.c: New file.
34 * data-parser.h: New file.
36 * data-list.c (struct dls_var_spec): Removed.
37 (ll_to_dls_var_spec): Removed.
38 (enum dls_type): Removed.
39 (struct data_list_pgm): Rename struct data_list_trns. Remove
40 pool, specs, type, record_cnt, delims, skip_records, value_cnt
41 members. Add new `parser' member.
42 (cmd_data_list): Use data-parser infrastructure.
45 (dump_fixed_table): Removed.
46 (dump_free_table): Removed.
48 (read_from_data_list): Removed.
49 (read_from_data_list_fixed): Removed.
50 (read_from_data_list_free): Removed.
51 (read_from_data_list_list): Removed.
52 (data_list_trns_free): Rename arguments for clarity.
53 (data_list_trns_proc): Ditto.
54 (data_list_casereader_read): Removed.
55 (data_list_casereader_destroy): Removed.
56 (data_list_casereader_class): Removed.
58 * get-data.c (cmd_get_data): Support TXT type.
59 (set_type): New function.
60 (parse_get_txt): New function.
62 2007-12-04 Ben Pfaff <blp@gnu.org>
64 * placement-parser.c (parse_column): New function.
65 (parse_column_range): Add `base' argument. Update all callers.
67 2007-12-04 Ben Pfaff <blp@gnu.org>
69 Make GET DATA a separate command, instead of something invoked
72 * automake.mk: Remove get-data.h from sources.
74 * get-data.h: Removed.
76 * get-data.c (parse_get_data_command): Rename cmd_get_data.
78 * get.c (parse_read_command): No longer any need to check for DATA
81 2007-12-04 Ben Pfaff <blp@gnu.org>
83 * src/language/data-io/data-reader.c (struct dfm_reader): New
84 `file_size' member to support dfm_get_percent_read.
85 (dfm_open_reader): Initialize file_size.
86 (dfm_get_percent_read): New function.
88 2007-11-08 Ben Pfaff <blp@gnu.org>
90 Patch #6256: add support for binary, 360 file formats. Reviewed
93 * data-reader.c (struct dfm_reader): New member `block_left'.
94 (dfm_open_reader): Initialize block_left. For FH_MODE_TEXT, open
95 the file in text mode.
96 (read_error): New function.
97 (partial_record): New function.
98 (try_to_read_fully): New function.
99 (enum descriptor_type): New enum.
100 (read_descriptor_word): New function.
101 (corrupt_size): New function.
102 (read_size): New function.
103 (read_file_record): Implement new modes.
104 (read_record): Now take care of tracking line numbers here.
105 (dfm_reader_get_legacy_encoding): New function.
107 * data-writer.c (dfm_put_record): Implement new modes.
108 (dfm_writer_get_legacy_encoding): New function.
110 * file-handle.q: Parse new formats.
111 (cmd_file_handle): Set up new formats.
113 * print.c (struct print_trns): New member `encoding'.
114 (internal_cmd_print): Set encoding.
115 (print_trns_proc): Recode output data if necessary.
116 (flush_records): Recode leader byte.
118 2007-11-03 Ben Pfaff <blp@gnu.org>
120 Allow output files to overwrite input files (bug #21280).
122 * data-list.c (cmd_data_list): Manage file handle reference
125 * data-reader.c (struct dfm_reader): Add `lock' member.
126 (dfm_close_reader): Simplify, as reference counting is now
127 separate from locking.
128 (dfm_open_reader): Lock file.
130 * data-writer.c (struct dfm_writer): Add fh_lock, replace_file
132 (dfm_open_writer): Lock file and prepare for replacement.
133 (dfm_close_writer): Unlock file and replace it.
135 * file-handle.q (cmd_close_file_handle): Use fh_unname.
136 (fh_parse): Don't distinguish existing handles for a given file
137 name from new ones. Manage file handle reference counts.
139 * get.c (parse_read_command): Manage file handle reference counts.
140 (parse_write_command): Ditto.
141 (mtf_close_all_files): Ditto.
143 * inpt-pgm.c (cmd_reread): Manage file handle reference counts.
145 * print-space.c (cmd_print_space): Manage file handle reference
148 * print.c (internal_cmd_print): Manage file handle reference
151 2007-11-03 John Darrington <john@darrington.wattle.id.au>
153 * get.c: Add GET DATA command variant.
155 * get-data.c get-data.h (new files): Added support for
156 GET DATA /TYPE='gnm' command.
158 2007-09-23 Ben Pfaff <blp@gnu.org>
160 Bug #21111. Reviewed by John Darrington.
162 * data-list.c (data_list_trns_proc): Properly set retval when END
163 subcommand is in use.
164 (cmd_data_list): Don't allow END subcommand to be used with DATA
167 2007-09-12 Ben Pfaff <blp@gnu.org>
169 * get.c (get_translate_case): Change input case parameter from
170 const struct ccase * to struct ccase *, to match change in
171 casereader and casewriter translators. Destroy input case, to fix
174 2007-08-12 Ben Pfaff <blp@gnu.org>
176 * get.c (parse_read_command): Compact the values in the target
177 dictionary, to save space.
179 2007-08-12 Ben Pfaff <blp@gnu.org>
181 * get.c (struct case_map): Move into new file src/data/case-map.c.
182 (start_case_map): Ditto, and rename case_map_prepare_dict.
183 (finish_case_map): Ditto, and rename case_map_from_dict.
184 (map_case): Ditto, and rename case_map_execute.
185 (destroy_case_map): Ditto, and rename case_map_destroy.
186 (case_map_get_value_cnt): Ditto.
188 2007-08-12 Ben Pfaff <blp@gnu.org>
190 * get.c (case_map_get_value_cnt): New function.
192 2007-07-25 Ben Pfaff <blp@gnu.org>
195 * data-list.c (read_from_data_list_fixed): Handle multi-record
198 2007-07-11 Ben Pfaff <blp@gnu.org>
200 * get.c (map_case): Create destination case instead of leaving it
201 undefined. Fixes bug #20285.
202 Reviewed by John Darrington.
204 2007-06-06 Ben Pfaff <blp@gnu.org>
206 * get.c: Essentially rewrite MATCH FILES to support FIRST and
209 2007-06-06 Ben Pfaff <blp@gnu.org>
211 Adapt case sources, sinks, and clients of procedure code to the
214 * data-list.c: Make DATA LIST into a casereader.
216 * get.c: Change GET, IMPORT, SAVE, EXPORT to use casereaders,
219 * inpt-pgm.c: Use caseinit code. Turn INPUT PROGRAM into a
222 * list.q: Adapt to new procedure code.
224 2007-05-06 Ben Pfaff <blp@gnu.org>
226 Abstract the documents within a dictionary a little better.
227 Thanks to John Darrington for suggestion, initial version, and
230 * get.c (mtf_merge_dictionary): Simplify creating merged document.
232 * sys-file-info.c (display_documents): Use new
233 dict_get_document_line_cnt and dict_get_document_line functions.
235 Thu Feb 1 16:56:02 2007 Ben Pfaff <blp@gnu.org>
237 * file-handle.q (fh_parse): Update to new fh_create_file
240 Sat Dec 16 22:16:18 2006 Ben Pfaff <blp@gnu.org>
242 Make it possible to pull cases from the active file with a
243 function call, instead of requiring indirection through a callback
246 * automake.mk: Removed matrix-data.c.
248 * matrix-data.c: Removed.
250 * data-list.c (data_list_source_read): Conform with new
251 case_source_class interface.
252 (data_list_source_destroy): Ditto.
254 * get.c (case_reader_source_class): Ditto.
255 (case_reader_source_destroy): Ditto.
256 (parse_output_proc): Take advantage of new procedure interface.
257 (output_proc): Removed.
258 (struct mtf_file): Add "struct ccase *" member to allow use of new
260 (cmd_match_files): Take advantage of new procedure interface.
261 (mtf_processing_finish): Removed.
262 (mtf_read_nonactive_records): Renamed mtf_read_records. Now reads
263 from every file, without any exception for the active file.
264 (mtf_compare_BY_values): Simplify for new interface.
265 (mtf_processing): Simplify for new interface.
267 * inpt-pgm.c (is_valid_state): New function.
268 (input_program_source_read): Conform with new case_source_class
270 (input_program_source_destroy): Ditto.
271 (end_case_trns_proc): Now just needs to return TRNS_END_CASE.
273 Sat Dec 9 18:43:34 2006 Ben Pfaff <blp@gnu.org>
275 * list.q (cmd_list): Use new var_create, var_destroy functions.
277 Thu Nov 30 21:51:58 2006 Ben Pfaff <blp@gnu.org>
279 * inpt-pgm.c (cmd_reread): Always return error code upon detecting
280 syntax error. Fixes bug #18419. Thanks to John Darrington for
283 Sun Nov 19 09:17:45 2006 Ben Pfaff <blp@gnu.org>
285 * data-list.c (parse_free): Follow documented (but odd) rule that
286 N format is treated as F format for free-field input.
288 * data-reader.c (read_file_record): Drop new-line character from
289 input text lines. This is symmetrical with the recently changed
290 dfm_put_record semantics.
292 Thu Nov 2 20:56:03 2006 Ben Pfaff <blp@gnu.org>
294 Implement SKIP keyword on DATA LIST. Fixes bug #17099.
296 * data-list.c: (struct data_list_pgm) Add `skip_records' members.
297 (cmd_data_list) Set skip_records based on user input.
298 (data_list_source_read) Skip records requested by user.
300 Tue Oct 31 20:04:06 2006 Ben Pfaff <blp@gnu.org>
302 * placement-parser.c: (PRS_TYPE_T) Now that struct fmt_spec uses
303 an enum fmt_type for its type member, we can't depend on the
304 ability to put negative values into that member as out-of-band
305 values, because enum fmt_type might be an unsigned type. So use
306 values around SCHAR_MAX instead, because we know that SCHAR_MAX
307 will fit into any type, signed or unsigned, and there aren't
308 nearly that many format types.
309 (parse_var_placements) Add for_input parameter to specify whether
310 we're parsing input or output formats. Update all callers.
311 (fixed_parse_columns) Ditto.
312 (fixed_parse_fortran) Ditto.
314 Tue Oct 31 18:21:48 2006 Ben Pfaff <blp@gnu.org>
316 * print-space.c (print_space_trns_proc): Let dfm_put_record add
317 the new-line character, to match dfm_put_record change below.
319 Sat Oct 28 11:57:19 2006 Ben Pfaff <blp@gnu.org>
321 * data-writer.c (struct dfm_writer): Removed `bounce' member, and
322 all references to it.
323 (dfm_put_record) Change semantics so that it adds formatting
324 itself, such as new-line characters, instead of putting that
325 responsibility on the caller. Also, pad binary records with
326 spaces instead of zeros, for compatibility.
328 * print.c (struct prt_out_spec) New member `sysmis_as_spaces'.
329 (struct print_trns) Remove `omit_new_lines' and all references,
330 since dfm_put_record() is taking care of that. Add
332 (internal_cmd_print) Allow an empty set of data to print. Set
334 (parse_specs) Allow an empty set of data to print.
335 (parse_variable_argument) Only add space with PRINT command. Set
337 (print_trns_proc) Indent records if include_prefix is set, for
338 compatibility. Output SYSMIS as spaces if sysmis_as_spaces is
339 set. Put "1" in first column if PRINT EJECT is used with an
340 external output file.
341 (flush_records) Ditto.
343 Sat Oct 28 16:19:57 WST 2006 John Darrington <john@darrington.wattle.id.au>
345 * data-reader.c: Eliminated references to extern variable getl_buf
347 Sat Aug 5 08:25:07 2006 Ben Pfaff <blp@gnu.org>
349 Fix bug #17329 in REREAD parsing, reported by John Darrington.
351 * inpt-pgm.c (cmd_reread): Fix file handle parsing.
353 Mon Jul 31 10:32:31 2006 Ben Pfaff <blp@gnu.org>
355 * print.c (parse_specs): Allow a comma between specifications.
357 Sun Jul 16 19:57:10 2006 Ben Pfaff <blp@gnu.org>
359 * automake.mk: (src_language_data_io_libdata_io_a_SOURCE) Add
360 print-space.c, placement-parser.c, placement-parser.h.
362 * data-list.c: Basically rewrote the whole thing. Broke out a lot
363 of code into placement-parser.c. Code is much cleaner now.
365 * placement-parser.c: New file.
367 * placement-parser.h: New file.
369 * print.c: Basically rewrote the whole thing. Broke out PRINT
370 SPACE into print-space.c. Code is much cleaner now.
372 * print-space.c: New file.
374 Sat Jul 1 17:39:40 2006 Ben Pfaff <blp@gnu.org>
376 Fix bug #11612, "q2c documentation does not agree with code".
378 * list.q: Audit use of q2c "+" prefixes that indicate that a
379 command may appear multiple times.
381 Sat Jul 1 20:44:22 2006 Ben Pfaff <blp@gnu.org>
383 Fix bug #15786: System File Creation crashes if directoy is
386 * get.c (parse_write_command): Check that the any_writer open
389 Tue Jun 27 22:44:28 2006 Ben Pfaff <blp@gnu.org>
391 Fix regression in command name completion reported by John
392 Darrington. Now completion is again state-dependent and occurs
393 only on the first line of a command.
395 * inpt-pgm.c: (cmd_input_program) Reading of first token in
396 command moved into cmd_parse.
398 Fri Jun 9 13:56:00 2006 Ben Pfaff <blp@gnu.org>
400 Reform string library.
402 * matrix-data.c (context): Use dynamic string.
403 (another_token) Deal with changed dfm_get_record() interface.
407 * data-list.c (struct data_list_pgm) Delete delims, delim_cnt
408 members, replacing them by struct string delims. Update all
409 references to use struct string functions.
410 (cut_field) Change interface to avoid needing "end_blank", by
411 getting the data-reader to remember that state for us. Change
412 internals to use substring. Update both callers.
414 * data-reader.c (read_file_record): Use ds_read_stream().
415 (dfm_get_record) Change interface to return substring. Updated
417 (dfm_expand_tabs) Use ds_find_char(). Now maintain position
418 relative to end-of-line. Use ds_swap().
419 (dfm_reread_record) Don't limit position by line length.
420 (dfm_column_start) Make parameter const.
421 (dfm_columns_past_end) New function.
422 (dfm_get_column) New function.
424 Thu May 25 18:26:26 WST 2006 John Darrington <john@darrington.wattle.id.au>
426 * print.c (print_trns_free): Made the code agree with the comment, by
427 not freeing PRT. Has the side effect that the command no longer
428 crashes on invalid syntax.
430 Tue May 9 20:55:46 2006 Ben Pfaff <blp@gnu.org>
432 * get.c (cmd_match_files): Fix memory leak replacing default_dict.
434 Sat May 6 22:25:09 2006 Ben Pfaff <blp@gnu.org>
438 * list.q (write_fallback_headers): (write_fallback_headers)
439 Properly record width of leader and pass it to write_varname().
441 Sat May 6 19:03:13 2006 Ben Pfaff <blp@gnu.org>
443 * get.c: (mtf_merge_dictionary) Fix value label memory leak.
445 Sat May 6 13:51:16 2006 Ben Pfaff <blp@gnu.org>
447 Use a casefile, instead of a case sink, for MATCH FILES output.
448 It's more straightforward, although it has the same effect.
450 * get.c: (struct mtf_proc) Replace `sink' case sink member by
451 `output' casefile member.
452 (cmd_match_files) Work with casefile instead of sink.
453 (mtf_processing) Add case to casefile instead of sink.
455 Sat May 6 10:43:07 2006 Ben Pfaff <blp@gnu.org>
457 Continue reforming procedure execution. In this phase, get rid of
458 the output code for SPLIT FILE groups in procedure.c, which really
459 shouldn't be doing any output. Move it into the individual
460 procedures instead. This also adds some flexibility.
462 * list.q (write_all_headers): Call output_split_file_values().
464 Wed May 3 23:00:17 2006 Ben Pfaff <blp@gnu.org>
466 Continue reforming procedure execution. In this phase, get rid of
467 many global variables, consolidating procedure execution in
468 procedure.c. Encapsulate transformations in new "struct
469 trns_chain". Also, change implementation of N OF CASES, FILTER,
470 and PROCESS IF from special cases to transformations.
472 * data-list.c: (data_list_trns_proc) Return TRNS_END_FILE at end
473 of file. (Why didn't we do this before?)
474 (cmd_match_files) Direct procedure output to null sink.
475 Use discard_variables() instead of indirect version.
477 * inpt-pgm.c: Use transformation chain.
478 (struct input_program_pgm) Add trns_chain member.
479 (cmd_input_program) Initialize trns_chain member and capture
480 transformations with proc_capture_transformations().
481 (input_program_source_read) Use trns_chain_execute().
482 (destroy_input_program) Destroy input chain.
484 Tue May 2 10:39:56 WST 2006 John Darrington <john@darrington.wattle.id.au>
486 * list.q Changed from using fixed length char buffers to struct
487 string so that any length variables can be used.
489 Mon May 1 18:21:19 2006 Ben Pfaff <blp@gnu.org>
491 Further clean up the CMD_* command result codes.
493 * (enum cmd_result_extensions) New. Add CMD_END_INPUT_PROGRAM and
494 CMD_END_CASE result codes.
495 (struct input_program_pgm) Added case_nr, write_case, wc_data
496 members for use by END CASE transformation.
497 (emit_END_CASE) New function.
498 (cmd_input_program) Interpret CMD_END_CASE by outputting an END
499 CASE transformation. If none is output by the input program
500 itself, add one automatically at the end. Change lack of
501 variables from warning to error.
502 (cmd_end_input_program) Return CMD_END_INPUT_PROGRAM instead of
504 (input_program_source_read) No longer any need to special-case END
505 CASE. Handle TRNS_DROP_CASE properly. Initialize new members in
506 inp for use by END CASE transformation.
507 (destroy_input_program) New function.
508 (input_program_source_destroy) Just call destroy_input_program().
509 (cmd_end_case) Just return CMD_END_CASE.
510 (end_case_trns_proc) No longer a stub handled by
511 input_program_source_read(). Actually output the case and
512 increment the case number.
514 Mon May 1 16:06:30 2006 Ben Pfaff <blp@gnu.org>
516 Remove vestiges of REPEATING DATA support.
518 * data-list.c: (struct rpd_num_or_var) Removed.
519 (struct repeating_data_trns) Removed.
520 (cmd_repeating_data) Removed.
521 (find_variable_input_spec) Removed.
522 (parse_num_or_var) Removed.
523 (parse_repeating_data) Removed.
524 (realize_value) Removed.
525 (struct rpd_parse_info) Removed.
526 (rpd_parse_record) Removed.
527 (repeating_data_trns_proc) Removed.
528 (repeating_data_trns_free) Removed.
529 (repeating_data_set_write_case) Removed.
532 * inpt-pgm.c: (input_program_source_read) Don't deal with
535 * data-list.h: Removed.
537 * automake.mk (src_language_data_io_libdata_io_a_SOURCES): Removed
540 Mon May 1 15:58:28 2006 Ben Pfaff <blp@gnu.org>
542 Remove vestiges of FILE TYPE support.
544 * data-list.c: (cmd_data_list) Don't check for FILE TYPE.
545 (cmd_repeating_data) Ditto.
547 * automake.mk (src_language_data_io_libdata_io_a_SOURCES): Remove
548 file-type.c, file-type.h.
550 * file-type.c: Removed.
552 * file-type.h: Removed.
554 Wed Apr 26 13:16:28 2006 Ben Pfaff <blp@gnu.org>
556 Improve the way we handle the various parsing "states". Until now
557 we've hard-coded the state transitions in the command definition
558 file, but that's error-prone and, worse, it's redundant--we can
559 figure out what state we're in anyhow. We can cleanly handle
560 INPUT PROGRAM and FILE TYPE with a nested command-processing loop.
562 * data-list.c: (cmd_data_list) Use in_file_type() or
563 in_input_program() in place of case_source_is_class() or
564 case_source_is_complex().
566 * file-type.c: NB: Not really fixed except minimally to compile,
567 because it doesn't work anyway.
568 (in_file_type) New function.
569 (cmd_record_type) No need to check that we're in FILE TYPE.
570 (cmd_end_file_type) Ditto.
571 (var file_type_source_class) Make static.
573 * get.c: (cmd_match_files) Check vfm_source instead of pgm_state.
575 * inpt-pgm.c: (in_input_program) New function.
576 (cmd_input_program) Rewrite to include nested command processing
578 (cmd_end_input_program) Just return CMD_END_SUBLOOP.
579 (var input_program_source_class) Make static.
580 (cmd_end_case) No need to check that we're in INPUT PROGRAM.
581 (cmd_end_file) Ditto.
583 * automake.mk (src_language_data_io_libdata_io_a_SOURCES): Add
584 file-type.h, inpt-pgm.h.
586 * file-type.h: New file.
588 * inpt-pgm.h: New file.
590 Tue Apr 25 13:11:55 2006 Ben Pfaff <blp@gnu.org>
592 * print.c: Don't special-case MS-DOS line terminators.
593 (macro LINE_END_WIDTH) Removed.
594 (alloc_line) Line ends are 1 byte.
595 (print_trns_proc) Just output \n for line end.
597 Sun Apr 23 22:05:58 2006 Ben Pfaff <blp@gnu.org>
599 Continue reforming error message support. In this phase, get rid
600 of message "titles" and put the message text in `struct error'.
601 Now `struct error' encapsulates a message more properly.
603 * data-list.c: (macro RPD_ERR) Removed.
604 (rpd_msg) New function. Updated all references to tmsg() to call
605 this function instead.
607 Sat Apr 15 19:38:13 2006 Ben Pfaff <blp@gnu.org>
609 Remove last users of struct file_ext so we can get rid of it
612 * data-reader.c: (struct dfm_reader) Change file member from
613 struct file_ext to FILE *. Updated all references.
614 (dfm_close_reader) Close file with fn_close() instead of
615 fn_close_ext(). Also, make a copy of the file name from the file
616 handle before closing it, because we can't extract it after we
618 (dfm_open_reader) Open file with fn_open() instead of
621 * data-writer.c: (struct dfm_writer) Change file member
622 struct file_ext to FILE *. Updated all references.
623 (dfm_close_writer) Close file with fn_close() instead of
624 fn_close_ext(). Also, make a copy of the file name from the file
625 handle before closing it, because we can't extract it after we
627 (dfm_open_writer) Open file with fn_open() instead of
630 Sat Apr 15 18:00:32 2006 Ben Pfaff <blp@gnu.org>
632 * data-list.c: Add prototype to suppress warning for
633 cmd_repeating_data().
635 Thu Mar 2 08:40:33 WST 2006 John Darrington <john@darrington.wattle.id.au>
637 * Moved files from src directory