1 2007-08-12 Ben Pfaff <blp@gnu.org>
3 Make casewriters keep track of the number of `union value's in
4 each case. This is useful for two reasons: casewriter_write can
5 then check that the case being written is large enough, and later
6 recipients of the casewriter can determine the size of the case.
8 * casewriter-translator.c (casewriter_create_translator): Add
11 * casewriter.c (struct casewriter): Add value_cnt member.
12 (casewriter_write): Check that the case passed in is big enough.
13 (casewriter_get_value_cnt): New function.
14 (casewriter_create): Add value_cnt parameter.
17 2007-08-09 Ben Pfaff <blp@gnu.org>
19 Fix bug reported by Jason Stover.
20 * settings.c: Move get_termcap_viewport and in particular the
21 #include for <curses.h> to the end of the file. curses.h
22 redefines bool on some systems (e.g. OpenBSD), which causes
23 disagreement between uses of bool before its inclusion and
25 Tested by Jason Stover.
27 2007-07-29 Ben Pfaff <blp@gnu.org>
29 Provisional fix for bug #18692 and bug #20161. Reviewed by John
32 * file-name.c (fn_open): Only pass "r" or "w" to popen as mode
33 argument (never "rb" or "wb") because SUSv3 says that only those
34 modes are defined, and glibc in fact rejects other modes.
36 Open portable files with fn_open so that they can be read from
37 pipes. Fix missing fh_close call to go along with fh_open.
38 Report an error if the file close reports an error.
39 * por-file-reader.c (close_reader): New function.
40 (por_file_casereader_destroy): Use close_reader.
41 (pfm_open_reader): Open file with fn_open.
43 2007-07-28 Ben Pfaff <blp@gnu.org>
45 Make PSPP able to read all the portable files I could find on the
46 web. Thanks to John Darrington for review. Bug #17620.
47 * por-file-reader.c (struct pfm_reader): New member `line_length'.
48 (error): Print file offset in hexadecimal.
49 (warning): New function.
50 (advance): Treat lines less than 80 bytes long as padded to 80
52 (pfm_open_reader): Call read_documents if we find an "E" record.
53 (convert_format): Convert invalid formats to the default format
54 instead of aborting reading the file.
55 (read_variables): Rename duplicate variable names instead of
56 aborting reading the file.
57 (read_value_label): Allow string variables of different widths to
58 be assigned value labels in the same record. Replace duplicate
59 value labels instead of aborting.
60 (read_documents): New function.
62 * por-file-writer.c (pfm_open_writer): Call write_documents if the
63 dictionary has documents.
64 (write_documents): New function.
66 2007-07-25 Ben Pfaff <blp@gnu.org>
68 Fix bugs related to bug #17213.
70 * settings.c: Use HAVE_LIBNCURSES instead of HAVE_LIBTERMCAP,
71 since the former is what config.h has. Include the needed ncurses
73 (static var echo) Rename to `do_echo' because the original name is
74 the same as an ncurses identifier.
75 (get_termcap_viewport) Use error instead of msg.
77 * file-name.c (fn_interp_vars): Fix interpolation of $VARS.
78 (fn_close): Don't close stdin, stdout, stderr.
80 2007-07-26 John Darrington <john@darrington.wattle.id.au>
82 * procedure.c procedure.h: Added callbacks which get invoked whenever
83 a dataset's transformation chain changes.
85 2007-07-24 Ben Pfaff <blp@gnu.org>
88 * sys-file-writer.c (write_variable_display_parameters): Use new
89 var_default_display_width function to choose display width of
90 segments after the first one in a given variable.
91 * variable.c (var_create): Use var_default_display_width to pick
92 new variable's display width.
93 (var_default_display_width): New function.
94 Reviewed by John Darrington.
96 2007-07-24 Ben Pfaff <blp@gnu.org>
99 * por-file-writer.c (write_variables): Write weight variable.
100 Reviewed by John Darrington.
102 2007-07-23 Ben Pfaff <blp@gnu.org>
104 Improvements to system file reader and writer.
106 First, move all detailed knowledge of very long strings into
107 sys-file-private.[ch], so that this nasty stuff can be isolated.
109 * sys-file-private.c (REAL_VLS_CHUNK): New macro.
110 (EFFECTIVE_VLS_CHUNK): New macro.
111 (min_int): New function.
112 (max_int): New function.
113 (sfm_width_to_bytes): Rewrite.
114 (sfm_width_to_octs): New function.
115 (sfm_segment_alloc_width): New function.
116 (sfm_segment_alloc_bytes): New function.
117 (sfm_segment_used_bytes): New function.
118 (sfm_segment_offset): New function.
119 (sfm_segment_effective_offset): New function.
120 (sfm_dictionary_to_sfm_vars): New function.
122 * sys-file-private.h (MIN_VERY_LONG_STRING): Removed.
123 (EFFECTIVE_LONG_STRING_LENGTH): Removed.
124 (struct sfm_var): New structure.
126 Next, improvements to the system file reader.
128 * sys-file-reader.h (struct sfm_read_info): Changed `case_cnt' to
129 type casenumber. Added `version_major', `version_minor',
132 * sys-file-reader.c (struct sfm_reader): Replaced `flt64_cnt' by
133 `oct_cnt'. Rename `vars', `var_cnt' to `sfm_vars', `sfm_var_cnt'.
134 Change `case_cnt' to type casenumber. Removed `has_vls'.
135 (struct sfm_var): Removed.
136 (sfm_open_reader): Don't warn on wrong case size if the file was
137 written by SPSS 13, which tends to get it wrong. Use
138 sfm_dictionary_to_sfm_vars.
139 (read_header): Always output system file info.
140 (read_variable_record): Simplify code for reading missing values.
141 (read_machine_int32_info): Save version numbers from system file
142 into info struct passed as new argument.
143 (read_long_string_map): Restructured to use new sys-file-private
145 (read_value_labels): Use size_overflow_p.
146 (sys_file_casereader_read): Get rid of distinction between fast
147 and slow paths. Use information provided by sys-file-primate's
148 struct sfm_var to simplify code.
149 (skip_whole_strings): New function.
150 (read_int32): Renamed read_int. Changed return value to int.
152 (read_flt64): Renamed read_float. Changed return value to
153 double. Updated all callers.
154 (int32_to_native): Removed. Changed callers to use
156 (flt64_to_double): Removed. Changed callers to use float_convert.
158 Finally, get rid of int32, flt64 terminology and types in system
159 file writer. The former wasn't very useful since a POSIX "int"
160 can hold the whole range of int32 and we generally didn't have a
161 need for it to be exactly-32-bits, just at-least-32-bits. The
162 latter was inconvenient because we had to assume that it could be
163 different from double and thereby convert special values SYSMIS,
164 HIGHEST, LOWEST to and from it in multiple places. Instead, now
165 we just use "int" and "double" in most places, and do conversions,
166 if necessary, very close to where we do I/O. This change meant
167 that the writer code couldn't represent records in the file as C
168 structs any longer, but that's no great loss. The code actually
169 seems to be more readable without them.
171 Simplify the compression buffering code: only buffer as much as
172 necessary, which is no more than eight 8-byte units at any given
175 * sys-file-writer.c (typedef flt64): Removed.
176 (macro second_lowest_flt64): Removed.
177 (struct sysfile_header): Removed.
178 (struct sysfile_variable): Removed.
179 (struct sfm_writer): Removed `needs_translation', `has_vls',
180 `flt64_cnt'. Changed `compress' to type bool and `case_cnt' to
181 type casenumber. Renamed `vars' to `sfm_vars', `var_cnt' to
182 `sfm_var_cnt'. Replaced `buf', `end', `ptr', `x', `y' for
183 compression buffering by `opcodes', `opcode_cnt', `data',
184 `data_cnt'. Renamed `var_cnt_vls' as `segment_cnt'.
185 (sfm_open_writer): Use sfm_dictionary_to_sfm_vars. Use simple
186 data writer functions instead of structures.
187 (calc_oct_idx): New function.
188 (write_header): Use simple data writer functions instead of
190 (write_format_spec): Renamed write_format. New argument.
191 (write_variable_continuation_records): New function.
192 (write_variable): Use simple data writer functions instead of
193 structures. Use write_variable_continuation_records. Write
194 entire very long string instead of requiring caller to understand
196 (write_value_labels): Use simple data writer functions instead of
198 (write_documents): Ditto.
199 (write_variable_display_parameters): Use sys-file-private
200 functions to simplify. Use simple data writer functions instead
202 (write_vls_length_table): Use simple data writer functions instead
204 (write_longvar_table): Ditto.
205 (write_rec_7_34): Break into new functions
206 write_integer_info_record, write_float_info_record. Use simple
207 data writer functions instead of structures.
208 (buf_write): Removed.
209 (append_string_max): Removed.
210 (ensure_buf_space): Removed.
211 (sys_file_casewriter_write): Get rid of the distinction between
212 fast and slow paths, which didn't seem to be too useful. Use new
213 functions write_case_uncompressed, write_case_compressed.
214 (put_instruction): Removed.
215 (put_element): Removed.
216 (write_compressed_data): Removed.
217 (close_writer): Use flush_compressed. Only write case count to
218 system file if it will fit in the field.
219 (write_case_compressed): New function.
220 (write_case_uncompressed): New function.
221 (flush_compressed): New function.
222 (put_cmp_opcode): New function.
223 (put_cmp_number): New function.
224 (write_int): New function.
225 (convert_double_to_output_format): New function.
226 (write_float): New function.
227 (write_value): New function.
228 (write_string): New function.
229 (write_bytes): New function.
230 (write_zeros): New function.
231 (write_spaces): New function.
233 Reviewed by John Darrington.
235 2007-07-22 Ben Pfaff <blp@gnu.org>
237 Don't try to write very long strings to portable files. The
238 format does not support it.
240 * por-file-writer.c (MAX_POR_WIDTH): New macro.
241 (pfm_open_writer): Limit output width to MAX_POR_WIDTH.
242 (write_format): Add arg to take width to resize format to.
243 (write_value): Limit width of value written to MAX_POR_WIDTH.
244 (write_variables): Limit width of variable and its output formats
246 Reviewed by John Darrington.
248 2007-07-22 Ben Pfaff <blp@gnu.org>
250 * sys-file-reader.c (read_variable_to_value_map): Use max_warnings
251 local variable instead of literal 5.
252 Reviewed by John Darrington.
254 2007-07-22 Ben Pfaff <blp@gnu.org>
256 Fix problems with uniqueness of short names in system files with
257 very long string variables. Now a variable may have multiple
260 * automake.mk (src_data_libdata_a_SOURCES): Add new files
261 short-names.c, short-names.h.
263 * dictionary.c (dict_clone): Clone all the short names.
264 (compare_strings): Move into short-names.c.
265 (hash_strings): Ditto.
266 (set_var_short_name_suffix): Ditto.
267 (dict_assign_short_names): Ditto, rename short_names_assign,
268 change to assign all short names.
270 * por-file-writer.c (write_variables): Use short_names_assign
271 instead of dict_assign_short_names.
273 * short-names.c: New file.
275 * short-names.h: New file.
277 * sys-file-private.c (sfm_width_to_segments): New function.
279 * sys-file-reader.c (read_long_var_name_map): Save and restore all
280 the short names, not just the first one.
282 * sys-file-writer.c (cont_var_name): Removed.
283 (sfm_open_writer): Use short_names_assign instead of
284 dict_assign_short_names. Use unique short names assigned by
285 short_names_assign instead of those generated by cont_var_name.
287 * variable.c (struct variable): Remove `short_name' member,
288 replace by `short_names' and `short_name_cnt'.
289 (var_create) Initialize new members.
290 (var_get_short_name_cnt): New function.
291 (var_get_short_name): Now takes an index argument. Changed most
293 (var_set_short_name): Ditto.
294 (var_clear_short_name): Renamed var_clear_short_names, changed to
295 clear all short names.
297 Reviewed by John Darrington.
299 2007-07-22 Ben Pfaff <blp@gnu.org>
301 * variable.c (var_set_width): Use new var_set_width function.
303 * missing-values.c (mv_n_values): Drop assertion, which was not
306 * format.c (fmt_default_for_width): New function.
307 (fmt_resize): New function.
309 Reviewed by John Darrington.
311 2007-07-18 John Darrington <john@darrington.wattle.id.au>
313 * datasheet.c (datasheet_delete_columns): Added assertion to check
314 we're not deleting outside the range of the sheet.
317 * dictionary.c dictionary.h variable.c: Added the ability for string
318 variables to be resized.
320 * vardict.h: Added some prototypes (moved from dictionary.h) as
321 these should only be called by variable.c
324 2007-07-14 John Darrington <john@darrington.wattle.id.au>
326 * sfm-reader.c: Respect case_cnt field in file header.
328 2007-07-01 John Darrington <john@darrington.wattle.id.au>
330 * transformation.c transformation.h (trns_chain_execute): Changed the
331 signature (Patch #6057)
333 2007-06-10 Ben Pfaff <blp@gnu.org>
335 * casereader-filter.c (casereader_filter_destroy): Make sure to
336 write all the remaining excluded cases to the casewriter, if any.
338 * caseinit.c (init_list_destroy): Rewrite.
339 (init_list_clear): Ditto.
341 * casegrouper.c (casegrouper_get_next_group): Always set *reader
342 to null when returning false.
344 2007-06-06 Ben Pfaff <blp@gnu.org>
346 Actually implement the new procedure code and adapt all of its
347 clients to match. Also adapt all of the other case sources and
348 sinks in the tree and their clients to use the
349 casereader/casewriter infrastructure.
351 * automake.mk: Add and remove files.
353 * any-reader.c: Change into a casereader.
354 * por-file-reader.c: Ditto.
355 * scratch-reader.c: Ditto.
356 * sys-file-reader.c: Ditto.
358 * any-writer.c: Change into a casewriter.
359 * por-file-writer.c: Ditto.
360 * scratch-writer.c: Ditto.
361 * sys-file-writer.c: Ditto.
363 * procedure.c: Change to use casereader, casewriter, caseinit, and
364 other new infrastructure.
366 * scratch-handle.c: Adapt to new infrastructure.
368 * case-sink.c: Removed, now dead code.
369 * case-sink.h: Ditto.
370 * case-source.c: Ditto.
371 * case-source.h: Ditto.
372 * casefile-factory.c: Ditto.
373 * casefile-private.h: Ditto.
376 * casefilter.c: Ditto.
377 * casefilter.h: Ditto.
380 * fastfile-factory.c: Ditto.
381 * fastfile-factory.h: Ditto.
382 * storage-stream.c: Ditto.
383 * storage-stream.h: Ditto.
385 2007-06-06 Ben Pfaff <blp@gnu.org>
389 * automake.mk: Add new files.
391 * datasheet.c: New file.
393 * datasheet.h: New file.
395 2007-06-06 Ben Pfaff <blp@gnu.org>
397 Until now, the procedure code has provided a case to the
398 case_source, which has filled in the data values that come from
399 the active file. "Left" data values that don't come from the
400 active file naturally stay the same from case to case, because the
401 procedure code keeps using that same case.
403 One of the compromises that comes with the new procedure code is
404 that the active file allocates and provides its own case, which
405 the procedure code then has to resize to provide room for any
406 other variables that should go in the case and then fill in the
407 values of "left" variables. Then, when we're done with that case,
408 we have to save the values of "left" variables to copy into the
409 next case read from the active file.
411 The caseinit code helps with this.
413 * automake.mk: Add new files.
415 * caseinit.c: New file.
417 * caseinit.h: New file.
419 2007-06-06 Ben Pfaff <blp@gnu.org>
421 * value.h (value_cnt_from_width): New function.
423 * variable.c (var_get_value_cnt): Use new function.
425 2007-06-06 Ben Pfaff <blp@gnu.org>
427 Add casegrouper, to allow cases read from a given casereader to be
428 broken into groups, each of which has its own casereader.
429 Generally cases are grouped based on having equal values for some
432 * automake.mk: Add new files.
434 * casegrouper.c: New file.
436 * casegrouper.h: New file.
438 2007-06-06 Ben Pfaff <blp@gnu.org>
440 Add interface to lexicographical ordering of cases.
442 * automake.mk: Add new files.
444 * case-ordering.c: New file.
446 * case-ordering.h: New file.
448 2007-06-06 Ben Pfaff <blp@gnu.org>
450 Add casereaders and casewriters, the basis of the new data processing
451 implementation. A casereader is a uniform interface to reading cases
452 from a data source; a casewriter is a uniform interface to writing
453 cases to a data sink.
455 * automake.mk: Add new files.
457 * casereader-filter.c: New file.
459 * casereader-provider.h: New file.
461 * casereader-translator.c: New file.
463 * casereader.c: New file.
465 * casereader.h: New file.
467 * casewriter-provider.h: New file.
469 * casewriter-translator.c: New file.
471 * casewriter.c: New file.
473 * casewriter.h: New file.
475 2007-06-06 Ben Pfaff <blp@gnu.org>
477 "casewindow" data structure that extends the deque (from libpspp)
478 of cases with the ability to dump cases to disk if we get too many
481 * automake.mk: Add new files.
483 * casewindow.c: New file.
485 * casewindow.h: New file.
487 2007-06-06 Ben Pfaff <blp@gnu.org>
489 sparse_cases data structure that augments a sparse_array of cases
490 with the ability to dump cases to disk if we get too many cases in
493 * automake.mk: Add new files.
495 * sparse-cases.c: New file.
497 * sparse-cases.h: New file.
499 2007-06-06 Ben Pfaff <blp@gnu.org>
501 Adds a low-level on-disk case array data structure.
503 * automake.mk: Add new files.
505 * case-tmpfile.c: New file.
507 * case-tmpfile.h: New file.
509 2007-06-06 Ben Pfaff <blp@gnu.org>
511 In a couple of places we calculate the maximum number of cases to
512 keep in memory based on the user-defined workspace. Enable
513 centralizing the calculation through a new function.
515 * settings.c (get_workspace_cases): New function.
517 2007-06-06 Ben Pfaff <blp@gnu.org>
519 The casenumber type is defined in transformations.h, but case.h is
520 a more sensible place. Move it.
522 * case.h (CASENUMBER_MAX): New macro.
523 (typedef casenumber): Move here, from transformations.h.
525 2007-06-03 Ben Pfaff <blp@gnu.org>
527 Slightly generalize case_to_values and case_from_values functions.
529 * case.c (case_to_values): Rename case_copy_out, change interface.
530 (case_from_values): Rename case_copy_in, change interface.
532 * fastfile.c (fastfilereader_get_next_case): Update caller.
533 (write_case_to_disk): Ditto.
535 2007-06-02 Ben Pfaff <blp@gnu.org>
537 Clean up after a forgotten part of patch #5829.
539 * casedeque.h: Remove unused file.
541 * automake.mk: Remove casedeque.h from sources.
543 2007-05-10 Jason Stover <jhs@math.gcsu.edu>
545 * category.c: Removed redundant #include
547 2007-05-06 Ben Pfaff <blp@gnu.org>
549 Abstract the documents within a dictionary a little better.
550 Thanks to John Darrington for suggestion, initial version, and
553 * dictionary.c (struct dictionary): Change `documents' member from
554 char * to struct string.
555 (dict_clear): Destroy struct string.
556 (dict_get_documents): Convert struct string to char *.
557 (dict_set_documents): Set struct string. Pad to 80-character
559 (dict_clear_documents): New function.
560 (dict_add_document_line): New function.
561 (dict_get_document_line_cnt): New function.
562 (dict_get_document_line): New function.
564 * dictionary.h (macro DOC_LINE_LENGTH): New macro.
566 * sys-file-reader.c (read_documents): Use new document functions.
568 2007-04-19 John Darrington <john@darrington.wattle.id.au>
570 * sys-file-reader.c: When reading a system file which has no
571 long name table, automatically create one where the long names
572 are the lower case versions of the short names.
574 2007-04-22 Ben Pfaff <blp@gnu.org>
576 * dictionary.c (dict_set_split_vars): dict_destroy expects that
577 dict_clear will free most data related to the dictionary.
578 dict_clear does a decent job, except that dict_set_split_vars on
579 some systems won't actually free the dict's "split" member.
580 Instead, it'll allocate a 1-byte region. Fix this.
582 * value.c (value_copy): New function.
583 (value_set_missing): Ditto.
585 2007-04-22 John Darrington <john@darrington.wattle.id.au>
587 * Deleted existing category.h and moved cat-routines.h into
588 category.h Encapsulated struct cat_vals better.
590 2007-04-19 John Darrington <john@darrington.wattle.id.au>
592 * sys-file-reader.c: When reading a system file which has no
593 long name table, automatically create one where the long names
594 are the lower case versions of the short names.
596 2007-04-16 John Darrington <john@darrington.wattle.id.au>
598 * sys-file-reader.c: Some versions of Other Software seem to
599 produce system files with string variables' measure set to
600 zero. We'll assume these are supposed to be nominal variables.
602 2007-03-30 Ben Pfaff <blp@gnu.org>
604 * procedure.c: Adapt to new deque data structure.
606 Mon Feb 19 10:53:21 2007 John McCabe-Dansted <gmatht@gmail.com>
607 Ben Pfaff <blp@gnu.org>
609 * file-name.c: Mingw compatibility fixes.
610 (fn_search_path): Use ISSLASH instead of comparing against '/'
612 (fn_dir_name): Use dir_name from gnulib.
613 (fn_is_absolute): Use IS_ABSOLUTE_FILE_NAME from gnulib.
614 (fn_get_identity): Use GetFullPathName instead of canonicalize
615 from gnulib, because the latter does not fully support
616 Windows-style path names. Use this implementation based on the
617 detected presence of Windows instead of the absence of Unix, since
618 the new implementation is Windows-specific.
619 (fn_compare_file_identities): In Windows implementation, compare
620 names case-insensitively.
622 Sun Feb 18 13:28:02 2007 Ben Pfaff <blp@gnu.org>
624 * make-file.c: Don't include mkstemp.h, because gnulib now causes
625 <stdlib.h> to have the same effect.
627 Sun Feb 18 11:20:24 2007 Ben Pfaff <blp@gnu.org>
629 * por-file-reader.c: Add missing _() around messages.
631 Sun Feb 11 20:44:13 2007 Ben Pfaff <blp@gnu.org>
633 * make-file.c: Include "mkstemp.h", without which linking on
636 Thu Feb 8 14:59:05 2007 Ben Pfaff <blp@gnu.org>
638 Reduce platform dependence.
640 * file-name.c (fn_tilde_expand): Removed, and removed calls to it.
641 Everywhere we using this, we really should have just depended on
642 the shell to expand tildes.
643 (fn_search_path): Simplify, given that we don't do tilde expansion
645 (fn_normalize): Removed. Caller changed to use the canonicalize
647 (fn_get_cwd): Removed. Only user was fn_normalize.
648 (fn_is_absolute): Really only test for absolute names.
649 (fn_is_special): Use pipe files if HAVE_POPEN, not if we're in
651 (fn_readlink): Removed, as it was only used fn_normalize.
652 (fn_exists): Assume the stat function is available; gnulib does.
653 (fn_open): Use pipe files if HAVE_POPEN, not if we're in unix.
655 Sat Feb 3 21:52:17 2007 Ben Pfaff <blp@gnu.org>
657 * dictionary.c (dict_create_vector_assert): New function.
659 Wed Feb 7 21:25:15 2007 Ben Pfaff <blp@gnu.org>
661 * file-name.c (fn_normalize): Correct name of function
662 fn_is_special. Thanks to John McCabe-Dansted <gmatht@gmail.com>
663 for pointing this out.
665 Thu Feb 1 16:53:37 2007 Ben Pfaff <blp@gnu.org>
667 We are using a single member in struct file_handle, the "name"
668 field, for more than one purpose. When it begins with '"', it's a
669 file name; otherwise, it's a token that can be used to identify
670 it. When that assertion fires, it's because we searched for the
671 name case-sensitively as a file name (so that there was no match),
672 and then we try to insert it case-insensitively as a token, which
673 fails because duplicates aren't allowed.
675 Solution: break the two purposes into two separate fields. This
676 fixes the problem and likely makes the code easier to read too.
678 Fixes bug #18922. Thanks to John Darrington for bug report and
681 * file-handle-def.c (struct file_handle): New `id' member.
682 (fh_from_name): Rename fh_from_id. Update all callers.
683 (create_handle): New `id' parameter. Update all callers.
684 (fh_create_file): Ditto.
685 (fh_get_id): New function.
687 Mon Jan 15 16:18:10 2007 Ben Pfaff <blp@gnu.org>
689 * case.c (case_is_null): Change return type to bool.
691 Mon Jan 15 10:57:28 2007 Ben Pfaff <blp@gnu.org>
695 * case.c (case_clone) [DEBUGGING]: When debugging, don't use
696 reference counting to share data. This makes it easy for
697 valgrind, etc. to find accesses to cases that have been destroyed
698 but have been kept around by another user's ref-count. This often
699 happens when the data set is small enough to find in memory; if a
700 bigger data set that would overflow to disk were used, then data
701 corruption would occur.
703 Mon Jan 15 10:55:18 2007 Ben Pfaff <blp@gnu.org>
707 * case.c (case_unshare): Make it check internally whether the
708 ref_cnt is greater than 1, so that the callers don't have to.
709 Update callers not to check.
711 Mon Jan 15 10:53:01 2007 Ben Pfaff <blp@gnu.org>
713 Before, I was thinking that I might want to get rid of reference
714 counting at some point. Now, I'm pretty sure that it's here to
715 stay. Thus, because we have to store the value_cnt anyway for
716 reference-counted cases, we might as well expose it to users.
718 * case.c (case_get_value_cnt): New function.
719 (case_resize): Drop OLD_CNT argument. Update all callers. Only
720 resize case if its size actually changed.
722 * casefile.c (casefile_append_xfer): Use case_get_value_cnt
723 instead of peeking inside struct case directly.
724 (casefile_append): Ditto.
726 Mon Jan 15 10:50:22 2007 Ben Pfaff <blp@gnu.org>
728 Get rid of the inlines for the case functions, which made the
729 header file hard to read. (Also, in testing with "-O2 -DNDEBUG",
730 the inlines didn't speed up "make check" at all, which is not a
731 perfect benchmark but seems indicative.)
733 * case.c: Remove #ifdef DEBUGGING...#endif around many function
734 definitions. Remove some assertions on nonnull pointers that were
735 redundant with a pointer dereference soon after in the function.
737 (struct case_data): Move definition here from case.h.
741 (case_data_wr): Ditto.
743 Sun Jan 14 21:41:12 2007 Ben Pfaff <blp@gnu.org>
745 * automake.mk: Add casedeque.h to sources.
747 * casedeque.h: New file.
749 * procedure.c: (struct dataset) Change lag_count, lag_head,
750 lag_queue member into single struct casedeque member. Update all
751 users to use the casedeque instead.
754 Sun Jan 14 21:43:12 2007 Ben Pfaff <blp@gnu.org>
756 * procedure.c: Simplify lagged cases interface. Updated all
757 clients--well, the only client--to use the simplified interface.
758 (dataset_n_lag) Removed.
759 (dataset_set_n_lag) Removed.
760 (dataset_need_lag) New function.
762 Tue Jan 9 07:20:05 WST 2007 John Darrington <john@darrington.wattle.id.au>
764 * dictionary.c procedure.c: More changes to ensure that callbacks occur
765 whenever appropriate, but only when the dataset/dictionary is in a
768 Sun Jan 7 08:33:04 WST 2007 John Darrington <john@darrington.wattle.id.au>
770 * dictionary.c dictionary.h : Added callbacks for change of filter and
771 split variables. Refactored some code to ensure that callbacks get
772 invoked when appropriate.
774 * procedure.c (proc_cancel_temporary_transformations): Make sure that
775 replace_dict callback occurs when permanent_dict replaces the current
778 Wed Jan 3 11:02:11 WST 2007 John Darrington <john@darrington.wattle.id.au>
780 * dictionary.c dictionary.h : Added callback for when the weight
781 variable of a dictionary changes.
783 Mon Jan 1 10:36:26 WST 2007 John Darrington <john@darrington.wattle.id.au>
785 * dictionary.c dictionary.h : Added replace_source and replace_dict
786 callbacks, and functions to deal with them.
788 Fri Dec 22 13:56:08 2006 Ben Pfaff <blp@gnu.org>
790 Simplify missing value handling.
792 * missing-values.h (enum mv_class): New type.
793 (enum mv_type): Moved definition into missing-values.c and renamed
794 each MV_* to MVT_*, to distinguish them from the exposed mv_class
795 enums. Updated all uses.
796 (struct missing_values): Changed type of `type' from `enum
797 mv_type' to `int' because the definition is no longer exposed.
799 * missing-values.c (mv_is_value_missing): Add new enum mv_class
800 parameter. Update all callers.
801 (mv_is_num_missing): Ditto.
802 (mv_is_str_missing): Ditto.
803 (mv_is_value_user_missing): Removed. Changed callers to use
805 (mv_is_num_user_missing): Removed. Changed callers to use
807 (mv_is_str_user_missing): Removed. Changed callers to use
809 (mv_is_value_system_missing): Removed. Changed callers to use
811 (mv_set_type): Removed. Changed callers to use mv_clear.
812 (mv_clear): New function.
814 * variable.c (var_is_value_missing): Add new enum mv_class
815 parameter. Update all callers.
816 (var_is_num_missing): Ditto.
817 (var_is_str_missing): Ditto.
818 (var_is_value_user_missing): Removed. Changed callers to use
819 var_is_value_missing.
820 (var_is_num_user_missing): Removed. Changed callers to use
822 (var_is_str_user_missing): Removed. Changed callers to use
824 (var_is_value_system_missing): Removed. Changed callers to use
825 var_is_value_missing.
827 * casefilter.c (struct casefilter): Use enum mv_class in place of
829 (casefilter_variable_missing): Adapt to new member.
830 (casefilter_create): Change signature to take enum mv_class,
833 Fri Dec 22 20:08:38 WST 2006 John Darrington <john@darrington.wattle.id.au>
835 * casefile-factory.h fastfile-factory.c fastfile-factory.h: New files.
837 * case-sink.c case-sink.h procedure.c procedure.h
838 storage-stream.c: Now uses the factory.
840 Sat Dec 16 22:05:18 2006 Ben Pfaff <blp@gnu.org>
842 Make it possible to pull cases from the active file with a
843 function call, instead of requiring indirection through a callback
846 * case-source.h (struct case_source_class): Change ->read function
847 to return a single case, instead of calling a callback function
848 for each case. Change ->destroy function to return an error
851 * case-source.c (free_case_source): Pass along the value returned
852 by the case_source ->destroy function.
854 * procedure.c (struct write_case_data): Removed.
855 (struct dataset): Added some members to track procedure state.
856 (procedure): Optimize the trivial case at this level.
857 (internal_procedure): Re-implement in terms of proc_open,
858 proc_read, proc_close.
859 (proc_open) New function.
860 (proc_read) New function.
861 (proc_close) New function.
862 (write_case) Moved into proc_read.
863 (close_active_file) Moved closing of data source into proc_close.
865 * storage-source.c: Rewrote to conform with modified
866 case_source_class interface.
868 * transformations.c (trns_chain_execute): Added argument to allow
869 starting execution from an arbitrary transformation. Updated
872 * transformations.h (enum TRNS_NEXT_CASE) Renamed TRNS_END_CASE.
874 Sat Dec 16 14:09:25 2006 Ben Pfaff <blp@gnu.org>
876 * sys-file-reader.c (read_display_parameters): Don't assume that
877 MEASURE_* and ALIGN_* have the same values found in system files.
879 * sys-file-writer.c (write_variable_display_parameters): Ditto.
881 * variable.h: Change MEASURE_NOMINAL, MEASURE_ORDINAL,
882 MEASURE_SCALE to be 0-based instead of 1-based. This also fixes
883 the value of n_MEASURES, which was off by 1 (at least from my
886 Sat Dec 16 12:17:34 WST 2006 John Darrington <john@darrington.wattle.id.au>
888 * dictionary.c dictionary.h vardict.h variable.c: Added optional
889 callbacks which are invoked when the dictionary or its
890 variables are changed.
892 * missing-values.c missing-values.h value-labels.c: Tidied up
893 consistency checks, and made some of them return false
894 instead of assert-failing.
896 Wed Dec 13 19:30:11 2006 Ben Pfaff <blp@gnu.org>
898 * calendar.c (calendar_days_in_month): New function.
900 Mon Dec 11 07:53:39 2006 Ben Pfaff <blp@gnu.org>
902 * value-labels.c (hash_int_val_lab): Only hash as many bytes as
903 the value label's width.
905 Sun Dec 10 14:21:29 2006 Ben Pfaff <blp@gnu.org>
907 * sfm-private.h: Move contents into sys-file-writer.c, which is
908 the only remaining user. Removed Borland C++-specific directives.
910 * sys-file-reader.c: Clean up and rewrite entire file. The
911 rewritten version is simpler and better abstracted, and should be
912 easier to maintain and extend. It avoids using structures to read
913 file data, which is prone to padding variations among compilers.
914 It should also handle non-IEEE 754 system files, although I
915 haven't been able to find any. It has been tested against many
916 .sav files obtained from the Web and found to produce the same
917 results as the earlier version of the code, or in some cases
918 improved results. It is more tolerant of format variations found
921 * sys-file-reader.h (struct sfm_read_info): Removed `big_endian'
922 member, putting an enum integer_format in its place. New member
923 `float_format'. Changed `compressed' member to type bool.
925 Sun Dec 10 13:48:53 2006 Ben Pfaff <blp@gnu.org>
927 * dictionary.c (dict_delete_consecutive_vars): New function.
929 Sat Dec 9 20:08:25 2006 Ben Pfaff <blp@gnu.org>
931 * file-name.c (fn_search_path): Remove prefix arg that was unused
932 by any caller. Updated all callers.
934 Sat Dec 9 20:04:22 2006 Ben Pfaff <blp@gnu.org>
936 * format.c (fmt_dollar_template): Use user's decimal point
937 character. Add assertion.
939 Sat Dec 9 20:02:25 2006 Ben Pfaff <blp@gnu.org>
941 * format.c (fmt_dollar_template): New function, based on
942 dollar_format_template from var-type-dialog.c.
944 Sat Dec 9 18:05:59 2006 Ben Pfaff <blp@gnu.org>
946 * data-out.c (output_scientific): Fix bad assumption that "buf" is
949 Sat Dec 9 17:23:23 2006 Ben Pfaff <blp@gnu.org>
951 Finish converting struct variable to an opaque type. In this
952 phase, we add remaining setter and getter functions, convert the
953 remaining PSPP code to use them, and do a bunch of cleanup. The
954 resulting changes are pervasive but mostly trivial, and only the
955 notable changes are logged.
957 * automake.mk (src_data_libdata_a_SOURCES): Add the new source
960 * case.c (case_data): Renamed case_data_idx.
961 (case_num): Renamed case_num_idx.
962 (case_str): Renamed case_str_idx.
963 (case_data_rw): Renamed case_data_rw_idx.
965 * case.h (case_data): New function with old name and an interface
966 that takes a variable instead of an index, which is easier to
967 use. Updated all callers to use the new interface, or to use the
968 new *_idx function (see above).
971 (case_data_rw): Ditto.
973 * category.c (cat_stored_values_destroy): Changed interface to
974 take a struct cat_vals * instead of a struct variable *.
976 * dictionary.c (dict_clone): Use new vector_clone function.
977 (dict_clear) Use new var_destroy function.
978 (add_var) New function.
979 (dict_create_var) Rewrite in terms of dict_create_var_assert.
980 (dict_create_var_assert) Rewrite in terms of add_var.
981 (dict_clone_var) Rewrite in terms of dict_clone_var_assert.
982 (dict_clone_var_assert) Rewrite in terms of var_clone, add_var.
983 (dict_lookup_var) Use new var_create, var_destroy functions.
984 (dict_contains_var) Rewrite in terms of new vardict functionality.
985 (set_var_dict_index) New function.
986 (set_var_case_index) New function.
987 (reindex_vars) New function.
988 (dict_delete_var) Rewrite in terms of new vardict functionality.
989 (dict_reorder_var) Ditto.
990 (dict_reorder_vars) Ditto.
991 (rename_var) New function.
992 (dict_rename_var) Use rename_var.
993 (dict_rename_vars) Use pool to simplify code. Use rename_var.
994 (dict_get_compacted_idx_to_fv) Rename
995 dict_get_compacted_dict_index_to_case_index, update callers.
996 (dict_create_vector) Use new vector_create function.
997 (dict_clear_vectors) Use new vector_destroy function.
998 (set_var_short_name_suffix) Move here from variable.c, renamed
999 from var_set_short_name_suffix, make static, update caller.
1001 * sys-file-private.c: New file.
1002 (sfm_width_to_bytes) Moved here from variable.c, renamed from
1003 width_to_bytes, update callers.
1005 * sys-file-private.h: New file. Later it will supplant
1006 sfm-private.h; for now it supplements it.
1007 (macro MIN_VERY_LONG_STRING) New macro.
1008 (macro EFFECTIVE_LONG_STRING_LENGTH) New macro, from value.h.
1010 * sys-file-reader.c: Use MIN_VERY_LONG_STRING - 1 where
1011 MAX_LONG_STRING was used before.
1013 * sys-file-writer.c: Ditto.
1015 * value-labels.c: Change the paradigm here to be that a null
1016 pointer is OK for a struct val_labs * in most cases; it just
1017 represents an empty set of value labels.
1018 (val_labs_copy) A copy of a null set is a null set.
1019 (val_labs_count) A null set has 0 labels.
1020 (val_labs_replace) Change return type to void. Rewrite for
1022 (val_labs_find) A null set does not contain the value.
1023 (value_to_string) Moved to variable.c, renamed var_get_value_name,
1024 transposed argument order, updated all callers.
1026 * value.c: New file.
1027 (value_dup) Moved here from variable.c.
1028 (compare_values) Ditto.
1031 * value.h: (macro MAX_SHORT_STRING) Rewrote for simplicity.
1032 (macro MAX_LONG_STRING) Removed, because it was only interesting
1033 for system files, not for general code.
1034 (macro MAX_VERY_LONG_STRING) Ditto.
1035 (macro EFFECTIVE_LONG_STRING_LENGTH) Moved to sys-file-private.h.
1036 (macro MAX_ELEMS_PER_VALUE) Removed, as it was unused.
1038 * vardict.h: New file, for an interface between variables and
1041 * variable.c: A lot of functions were moved around, for better
1043 (struct variable) Move definition here, from variable.h.
1044 (var_type_adj) Removed--makes i18n hard.
1045 (var_type_noun) Ditto.
1046 (var_create) New function.
1047 (var_clone) New function.
1048 (var_destroy) New function.
1049 (var_set_name) Assert that variable is not in a dictionary.
1050 (compare_var_names) Rename compare_vars_by_name and fix a couple
1051 of callers who thought the args were strings.
1052 (hash_var_name) Rename hash_var_by_name.
1053 (compare_var_ptr_names) Rename compare_var_ptrs_by_name.
1054 (hash_var_ptr_name) Rename hash_var_ptr_by_name.
1055 (var_is_very_long_string) Removed, because it was only interesting
1056 to system file code.
1057 (var_set_missing_values) Allow the argument to be the wrong width,
1058 as long as we can resize it. Simplify callers who were doing the
1059 resizing themselves.
1060 (var_get_value_labels) New function.
1061 (var_has_value_labels) New function.
1062 (var_set_value_labels) New function.
1063 (alloc_value_labels) New function.
1064 (var_add_value_label) New function.
1065 (var_replace_value_label) New function.
1066 (var_clear_value_labels) New function.
1067 (var_lookup_value_label) New function.
1068 (var_get_value_name) Moved here from variable.c, renamed from
1069 var_get_value_name, transposed argument order, updated all
1071 (var_to_string) Moved here, from variable-label.c.
1072 (var_set_leave) New function.
1073 (var_get_leave) New function.
1074 (var_must_leave) New function.
1075 (var_set_short_name_suffix) Moved to dictionary.c, renamed
1076 set_var_short_name_suffix.
1077 (var_get_dict_index) New function.
1078 (var_get_case_index) New function.
1079 (var_get_obs_vals) New function.
1080 (var_set_obs_vals) New function.
1081 (var_has_obs_vals) New function.
1082 (var_get_vardict) New function.
1083 (var_set_vardict) New function.
1084 (var_has_vardict) New function.
1085 (var_clear_vardict) New function.
1086 (value_dup) Moved to value.c.
1087 (compare_values) Ditto.
1090 * variable.h: (enum NUMERIC) Rename VAR_NUMERIC, update all users.
1091 (enum ALPHA) Rename VAR_STRING, update all users.
1093 * vector.c: New file.
1094 (struct vector) Moved here, from variable.h.
1095 (check_widths) New function.
1096 (vector_create) New function.
1097 (vector_clone) New function.
1098 (vector_destroy) New function.
1099 (vector_get_name) New function.
1100 (vector_get_var) New function.
1101 (vector_get_var_cnt) New function.
1102 (compare_vector_ptrs_by_name) New function.
1104 * vector.h: New file.
1106 Sun Dec 10 11:32:56 WST 2006 John Darrington <john@darrington.wattle.id.au>
1108 * casefilter.c (casefilter_variable_missing): Avoided comparision of
1109 string variables to SYSMIS. Thanks to Ben Pfaff for reporting this
1112 Sat Dec 9 07:18:03 WST 2006 John Darrington <john@darrington.wattle.id.au>
1114 * value-labels.c (destroy_atoms): New function.
1115 * value-labels.c (atom_create): Call destroy_atoms in atexit handler.
1117 Thu Dec 7 17:38:26 2006 Ben Pfaff <blp@gnu.org>
1119 Thanks to Jason Stover for pointing out this problem.
1121 * data-out.c (output_number): Use gsl_finite from GSL, which is
1122 portable, instead of isfinite, which is not.
1125 Thu Dec 7 15:22:38 WST 2006 John Darrington <john@darrington.wattle.id.au>
1127 * variable.c variable.h (value_dup): New function.
1129 Mon Dec 4 22:20:17 2006 Ben Pfaff <blp@gnu.org>
1131 Start converting struct variable to an opaque type. In this
1132 phase, we add a bunch of setter and getter functions and convert
1133 most of the PSPP code to use them. The resulting changes are
1134 pervasive but mostly trivial, and only the notable changes are
1137 * format.c (fmt_equal): New function.
1139 * variable.c (var_type_is_valid): New function.
1140 (measure_is_valid) Moved here, from format.c.
1141 (alignment_is_valid) Moved here, from format.c.
1142 (var_get_name) New function.
1143 (var_set_name) New function.
1144 (width_to_type) New function.
1145 (var_get_type) New function.
1146 (var_get_width) New function.
1147 (var_set_width) New function.
1148 (var_is_numeric) New function.
1149 (var_is_alpha) New function.
1150 (var_is_short_string) New function.
1151 (var_is_long_string) New function.
1152 (var_is_very_long_string) New function.
1153 (var_get_missing_values) New function.
1154 (var_set_missing_values) New function.
1155 (var_clear_missing_values) New function.
1156 (var_has_missing_values) New function.
1157 (var_is_value_missing) New function.
1158 (var_is_num_missing) New function.
1159 (var_is_str_missing) New function.
1160 (var_is_value_user_missing) New function.
1161 (var_is_num_user_missing) New function.
1162 (var_is_str_user_missing) New function.
1163 (var_is_value_system_missing) New function.
1164 (var_get_print_format) New function.
1165 (var_set_print_format) New function.
1166 (var_get_write_format) New function.
1167 (var_set_write_format) New function.
1168 (var_set_both_formats) New function.
1169 (var_get_label) New function.
1170 (var_set_label) New function.
1171 (var_clear_label) New function.
1172 (var_has_label) New function.
1173 (var_get_measure) New function.
1174 (var_set_measure) New function.
1175 (var_get_display_width) New function.
1176 (var_set_display_width) New function.
1177 (var_get_alignment) New function.
1178 (var_set_alignment) New function.
1179 (var_get_value_cnt) New function.
1180 (var_get_leave) New function.
1181 (var_get_short_name) New function.
1183 * variable.h: (struct variable) Removed "type" and "nv" members;
1184 they are now computed from "width" where needed.
1186 Mon Dec 4 21:38:40 2006 Ben Pfaff <blp@gnu.org>
1188 * missing-values.c (mv_resize): Don't write beyond end of the
1189 allocated buffer when resizing a long string.
1191 Sat Dec 2 16:28:32 2006 Ben Pfaff <blp@gnu.org>
1193 Clean up identifier code: don't require identifier enumerations to
1194 be in a particular order; make better use of string library;
1195 expose less of the internals.
1197 * identifier.c: (lex_skip_identifier) Rename lex_id_get_length,
1198 change interface. Updated all callers.
1199 (lex_id_match) Change interface to use struct substring, update
1201 (lex_id_match_len) Removed. Update callers to use lex_id_match.
1202 (global array keywords[]) Make static, change form. Update all
1203 users to use lex_id_name instead.
1204 (lex_is_keyword) New function.
1205 (lex_id_to_token) Change interface to use struct substring, update
1207 (lex_id_name) New function.
1209 * identifier.h: (T_FIRST_KEYWORD) Removed. Changed users to call
1210 lex_is_keyword instead.
1211 (T_LAST_KEYWORD) Removed.
1212 (T_N_KEYWORDS) Removed.
1214 Sat Nov 18 20:46:35 2006 Ben Pfaff <blp@gnu.org>
1216 * format.c: (fmt_date_template) Distinguish characters for which a
1217 space is output and any date delimiter is allowed on input, from
1218 those for which a space is output and only a space is allowed on
1219 input. The former is represented by X, the latter by a space.
1220 Also, drop distinction between h and H, changing the former to the
1223 * data-in.c: Completely rewrite internals to conform to SPSS input
1224 formats as closely as possible.
1225 (data_in) Changed external interface by replacing the structure
1226 that was used as a single argument by a set of arguments. Updated
1228 (data_in_finite_line) Removed. Converted all callers to use plain
1230 (data_in_get_integer_format) New function.
1231 (data_in_set_integer_format) New function.
1232 (data_in_get_float_format) New function.
1233 (data_in_set_float_format) New function.
1235 * data-in.h: (enums DI_IGNORE_ERROR, DI_IMPLIED_DECIMALS) Removed.
1236 (struct data_in) Removed.
1238 * data-out.c: (output_date) Drop each component from the input as
1239 it is output, to allow us to drop the distinction between h (a
1240 count of hours) and H (the hour of day) template characters.
1241 Also, handle new X template character.
1242 (output_scientific) Follow more rational rule on when to drop
1243 fraction introduced between SPSS 13 and 15. Updated test case to
1246 Sat Nov 11 11:41:26 2006 Ben Pfaff <blp@gnu.org>
1248 Fix buffer overflow reported by John Darrington.
1250 * data-out.c (output_bcd_integer): In case of SYSMIS, etc.,
1251 realize that DIGITS is a count of nibbles, not of bytes.
1253 Sat Nov 4 15:59:56 2006 Ben Pfaff <blp@gnu.org>
1255 * calendar.c (calendar_offset_to_gregorian) Also return the
1256 year-of-day. Change callers to new interface.
1258 * data-out.c: Completely rewrite internals to conform to SPSS
1259 output formats as completely as possible.
1260 (data_out) Change interface to put input parameters before output
1261 parameters, for consistency with the style I now prefer. Update
1263 (data_out_get_integer_format) New public function.
1264 (data_out_set_integer_format) New public function.
1265 (data_out_get_float_format) New public function.
1266 (data_out_set_float_format) New public function.
1268 * data-out.h: New file. Move prototype for data_out here, from
1271 * format.c: (fmt_step_width) Use equality comparison instead of
1272 bitwise and, for clarity.
1273 (fmt_is_string) Ditto.
1274 (fmt_input_to_output) Fix categories that are translated to F
1277 Sun Nov 5 08:29:34 WST 2006 John Darrington <john@darrington.wattle.id.au>
1279 * casefilter.c casefilter.h (new files), casefile.c casefile.h
1280 casefile-private.h: Added casefilter to assist commands with missing
1283 Sat Nov 4 11:47:09 2006 Ben Pfaff <blp@gnu.org>
1285 Implement SET ERRORS, SHOW ERRORS. Fixes bug #17609.
1287 * settings.c: (route_errors_to_terminal) New variable.
1288 (route_errors_to_listing) New variable.
1289 (get_error_routing_to_terminal) New function.
1290 (set_error_routing_to_terminal) New function.
1291 (get_error_routing_to_listing) New function.
1292 (set_error_routing_to_listing) New function.
1294 * settings.h: (SET_ROUTE_* enums) Removed, because unused.
1296 Tue Oct 31 19:58:27 2006 Ben Pfaff <blp@gnu.org>
1298 * format.c: Completely rewrite, to achieve better abstraction.
1299 Rewrite all references to formats in other files.
1301 * format.def: Rewrite and reorganize.
1303 * settings.c: Move everything related to custom currency formats
1304 into format.[ch], changing them in form, so as to group related
1305 code and definitions better. Changed all references to use the
1307 (static var decimal) Removed.
1308 (static var grouping) Removed.
1309 (static var cc) Removed.
1310 (get_decimal) Removed.
1311 (set_decimal) Removed.
1312 (get_grouping) Removed.
1313 (set_grouping) Removed.
1317 * settings.h: (macro CC_CNT) Removed.
1318 (macro CC_WIDTH) Removed.
1319 (struct custom_currency) Removed.
1321 Tue Oct 31 19:56:19 2006 Ben Pfaff <blp@gnu.org>
1323 * data-in.c (data_in): Use switch statement instead of table, to
1324 avoid dependence on the order of the FMT_* enums.
1326 Tue Oct 31 19:35:36 2006 Ben Pfaff <blp@gnu.org>
1328 * data-out.c: (num_to_string) Removed, because it was dead code.
1330 Tue Oct 31 18:09:24 2006 Ben Pfaff <blp@gnu.org>
1332 * data-in.c (parse_trailer): Fix error message.
1334 Sat Oct 28 11:56:50 2006 Ben Pfaff <blp@gnu.org>
1336 * format.c (fmt_is_binary): New function.
1338 Thu Oct 19 22:59:56 WST 2006 John Darrington <john@darrington.wattle.id.au>
1340 * procedure.c procedure.h: Encapsulated the static data into a single
1343 Sat Oct 14 16:56:44 2006 Ben Pfaff <blp@gnu.org>
1345 * casefile.c (casereader_read_xfer): Always initialize the case,
1346 even on an error condition.
1348 Wed Sep 27 09:37:49 WST 2006 John Darrington <john@darrington.wattle.id.au>
1350 * procedure.c (case_limit_trns_proc): Fixed buglet which rendered the
1351 entire function useless.
1353 Mon Sep 25 17:11:46 WST 2006 John Darrington <john@darrington.wattle.id.au>
1355 * casefile-private.h casefile.c casefile.h fastfile.c: Created new
1356 casereader method casereader_clone.
1358 * procedure.c pransformations.h: Introduced new type casenum_t
1360 Thu Sep 21 07:00:30 2006 Ben Pfaff <blp@gnu.org>
1362 * variable.c: (width_to_bytes) Rephrase code for clarify.
1364 Sun Jul 16 19:52:03 2006 Ben Pfaff <blp@gnu.org>
1366 * format.c: (fmt_type_from_string) New function.
1367 (fmt_to_string) Include decimals in output if the format has
1368 decimals, even if the format type does not. This way, we can
1369 accurately reproduce incorrect formats in user output.
1370 (check_common_specifier) Make the check for a bad format type an
1371 assertion, so we get bug reports if they show up. Fix message.
1372 Check for decimal places with a format type that doesn't allow
1374 (check_input_specifier) Remove check for FMT_X, which has been
1376 (check_output_specifier) Ditto.
1378 * format.def: Remove FMT_T, FMT_X, FMT_DESCEND, FMT_NEWREC.
1380 * format.h: (macro FMT_TYPE_LEN_MAX) New macro.
1381 (struct fmt_desc) Use FMT_TYPE_LEN_MAX in definition.
1382 (enum fmt_parse_flags) Removed.
1384 Mon Jul 17 18:26:21 WST 2006 John Darrington <john@darrington.wattle.id.au>
1386 * casefile.c casefile.h: Converted to an abstract base class.
1387 * casefile-private.h fastfile.c fastfile.h: New files.
1388 * automake.mk procedure.c scratch-writer.c storage-stream.c
1390 Wed Jul 12 21:02:26 2006 Ben Pfaff <blp@gnu.org>
1392 * procedure.c (internal_procedure): Create sink_case with only as
1393 many values as the compacted dictionary.
1395 Wed Jul 12 21:01:00 2006 Ben Pfaff <blp@gnu.org>
1397 Remove "debugging" code that caused plenty of false positives and
1400 * case.h (struct ccase): [DEBUGGING] Remove `this' member.
1402 * case.c: Remove all references to `this' member.
1404 Thu Jul 6 19:09:53 2006 Ben Pfaff <blp@gnu.org>
1406 Fix link error noted by Jason Stover.
1408 * storage-stream.c: Include <assert.h>.
1410 Tue Jul 4 08:47:35 2006 Ben Pfaff <blp@gnu.org>
1412 Fix bug #15766 (/KEEP subcommand on SAVE doesn't fully support
1413 ALL) and additional underlying system file issues.
1415 Thanks to John Darrington for review.
1417 First problem: var_hash points to variables not owned by the
1418 sys-file-reader, which the caller may free or modify. Use an
1419 array of sfm_vars instead, as done earlier (e.g. CVS version
1422 * sys-file-reader.c (struct sfm_reader): Remove var_hash, svars
1423 members and remove all code that references it. Add vars, var_cnt
1424 members. Remove fix_specials member, which was unused.
1425 (struct sfm_var) Remove name member, which was unused.
1426 (sfm_close_reader) Free vars member instead of var_hash.
1427 (compare_var_shortnames) Removed.
1428 (hash_var_shortname) Removed.
1429 (sfm_open_reader) Fill out vars array.
1430 (compare_var_index) Removed.
1431 (sfm_read_case) Use vars instead of var_hash.
1433 Second problem: we're confused about when we actually have very
1434 long strings, causing us to choose incorrectly between slow path
1435 and fast path in sfm_read_case.
1437 * sys-file-reader.c: (sfm_open_reader) Only mark has_vls if we
1438 have very long strings, not when we have long variable names,
1439 which is an unrelated feature.
1441 Tue Jun 27 12:06:49 2006 Ben Pfaff <blp@gnu.org>
1443 * variable.h: Move var_set and variable parsing declarations to
1444 new header, src/language/lexer/variable-parser.h. Modified lots
1445 of files to include the new header.
1447 Sun Jun 25 22:39:32 2006 Ben Pfaff <blp@gnu.org>
1449 * value-labels.c (value_to_string): When there's no value label,
1450 format the variable according to its print format, instead of
1451 always effectively using A or F format.
1453 Mon Jun 19 18:05:42 WST 2006 John Darrington <john@darrington.wattle.id.au>
1455 * casefile.c (casefile_get_random_reader): Nasty hack to get around
1458 * format.c: Removed tortological assertion.
1460 Fri Jun 9 12:20:09 2006 Ben Pfaff <blp@gnu.org>
1462 Reform string library.
1464 * file-name.c (fn_interp_vars): Change interface to take a
1465 substring as input. Updated all users.
1467 Fri Jun 9 12:11:24 2006 Ben Pfaff <blp@gnu.org>
1469 * format.c (measure_is_valid): Really return false when m >=
1472 Tue Jun 6 18:46:26 2006 Ben Pfaff <blp@gnu.org>
1474 Implement random access to casefiles, for use in GUI.
1476 * casefile.c: (struct casereader) Add `random', `file_ofs',
1477 `buffer_ofs' members.
1478 (casefile_get_random_reader) New function.
1479 (read_open_file) Break part into new function
1480 seek_and_fill_buffer().
1481 (fill_buffer) Update buffer_ofs, file_ofs.
1482 (casereader_seek) New function.
1484 Tue May 30 19:52:33 WST 2006 John Darrington <john@darrington.wattle.id.au>
1486 * settings.c: Added call to i18n{done, init}.
1488 Tue May 9 21:09:17 2006 Ben Pfaff <blp@gnu.org>
1490 * procedure.h: Add WARN_UNUSED_RESULT to procedure function
1493 Tue May 9 21:08:05 2006 Ben Pfaff <blp@gnu.org>
1495 * casefile.c: Convert many uses of `int' to `bool'.
1497 Sat May 6 22:49:43 2006 Ben Pfaff <blp@gnu.org>
1499 * transformations.c (trns_chain_destroy): Destroy chain's trns
1500 member, to fix memory leak.
1502 Sat May 6 22:48:30 2006 Ben Pfaff <blp@gnu.org>
1504 * storage-stream.c (storage_source_decapsulate): Destroy case
1505 source to fix memory leak.
1507 Sat May 6 22:46:47 2006 Ben Pfaff <blp@gnu.org>
1509 * scratch-reader.c (scratch_reader_read_case): Copy into existing
1510 case passed as argument instead of initializing the argument as a
1511 case. Fixes memory leak that showed up in
1512 tests/command/aggregate.sh with scratch files.
1514 Sat May 6 22:45:55 2006 Ben Pfaff <blp@gnu.org>
1516 * procedure.c (proc_done): Destroy default_dict, to fix memory
1519 Sat May 6 22:44:44 2006 Ben Pfaff <blp@gnu.org>
1521 Simplify procedure_with_splits().
1523 * procedure.c (struct split_aux_data): Removed case_count member.
1524 (procedure_with_splits) Don't initialize case_count.
1525 (split_procedure_case_func) Check whether prev_case is null
1526 instead of case_count.
1527 (split_procedure_end_func) Ditto.
1529 Sat May 6 22:42:23 2006 Ben Pfaff <blp@gnu.org>
1531 * case.c (case_move): Do nothing if dst and src are the same
1533 (case_try_create) Merge two similar cases.
1534 (case_copy) Unshare only if data must be actually copied.
1536 Sun May 7 10:04:06 WST 2006 John Darrington <john@darrington.wattle.id.au>
1538 * data-in.c data-out.c dictionary.c sys-file-reader.c
1539 sys-file-writer.c variable.c variable.h: Reworked very long string
1540 support for better encapsulation.
1542 Sat May 6 19:02:00 2006 Ben Pfaff <blp@gnu.org>
1544 * value-labels.c (val_labs_can_set_width): New function.
1545 (val_labs_set_width) Clear labels if increasing width to long
1547 (val_labs_destroy) Remove unneeded test for null.
1549 Sat May 6 16:14:08 2006 Ben Pfaff <blp@gnu.org>
1551 * value-labels.h: Remove unneeded dependency on variable.h.
1553 Sat May 6 15:58:36 2006 Ben Pfaff <blp@gnu.org>
1555 Get rid of `char *c' member in union value, for cleanliness.
1557 * value.h: (union value) Remove `c' member.
1559 Sat May 6 15:36:59 2006 Ben Pfaff <blp@gnu.org>
1561 Make dictionary compacting functions a little more general.
1563 * sys-file-writer.c (sfm_open_writer): Use
1564 dict_compacting_would_change().
1565 (does_dict_need_translation) Removed.
1567 Sat May 6 15:35:42 2006 Ben Pfaff <blp@gnu.org>
1569 Make dictionary compacting functions a little more general.
1571 * dictionary.c (dict_needs_compaction): Rename
1572 dict_compacting_would_shrink(). Update all callers.
1573 (dict_compacting_would_change) New function.
1575 Sat May 6 14:25:49 2006 Ben Pfaff <blp@gnu.org>
1577 * sys-file-writer.c: (does_dict_need_translation) Fix bug:
1578 inverted return value (!).
1580 Sat May 6 13:37:52 2006 Ben Pfaff <blp@gnu.org>
1582 Continue reforming procedure execution.
1584 * procedure.c: Search and replace "vfm" by "proc". Notably:
1585 (static var vfm_source) Rename proc_source. Update all
1587 (static var vfm_sink) Rename proc_sink. Update all references.
1589 Sat May 6 12:38:55 2006 Ben Pfaff <blp@gnu.org>
1591 Continue reforming procedure execution. In this phase, remove
1592 PROCESS IF, which was deprecated anyway and can be easily
1593 simulated with TEMPORARY followed by SELECT IF.
1595 * procedure.c: (open_active_file) Don't call
1596 add_process_if_trns().
1597 (discard_variables) Get rid of redundant call to
1598 proc_cancel_all_transformations().
1599 (add_process_if_trns) Removed.
1600 (process_if_trns_proc) Removed.
1601 (process_if_trns_free) Removed.
1603 Sat May 6 10:58:05 2006 Ben Pfaff <blp@gnu.org>
1605 Continue reforming procedure execution. In this phase, add
1606 `const' to the case passed to procedure()'s callback.
1608 Updated all users of procedure() as well.
1610 * procedure.c: (struct write_case_data) Add "const" to ccase
1611 parameter for case_func member.
1612 (procedure) Add "const" to ccase parameter for proc_func
1614 (multipass_case_func) Make ccase parameter const.
1615 (internal_procedure) Add "const" to ccase parameter for case_func
1617 (split_procedure_case_func) Make ccase parameter const.
1618 (multipass_split_case_func) Make ccase parameter const.
1620 Sat May 6 10:30:33 2006 Ben Pfaff <blp@gnu.org>
1622 Continue reforming procedure execution. In this phase, get rid of
1623 the output code for SPLIT FILE groups in procedure.c, which really
1624 shouldn't be doing any output. Move it into the individual
1625 procedures instead. This also adds some flexibility.
1627 Updated many users of procedure_with_splits() and
1628 multipass_procedure_with_splits() to call
1629 output_split_file_values() and to deal with increased use of
1632 * procedure.c: (struct split_aux_data) Add "const struct ccase *"
1633 parameter to begin_func member.
1634 (procedure_with_splits) Add "const struct ccase *" parameter to
1635 begin_func parameter. Make ccase parameter const in proc_func
1637 (split_procedure_case_func) Don't dump split file group. Pass
1639 (dump_splits) Moved to language/dictionary/split-file.c as
1640 output_split_file_values().
1641 (struct multipass_split_aux_data) Add "const struct ccase *"
1642 parameter to split_func member.
1643 (multipass_procedure_with_splits) Add "const struct ccase *"
1644 parameter to split_func parameter.
1645 (multipass_split_case_func) Save new SPLIT FILE case before
1647 (multipass_split_output) Pass saved SPLIT FILE case to split_func.
1649 Fri May 5 22:48:50 2006 Ben Pfaff <blp@gnu.org>
1651 Continue reforming procedure execution. Change
1652 internal_procedure() so that it calls open_active_file() and
1653 close_active_file(), which isolates most of the actual procedure
1656 * procedure.c: (struct write_case_data) Rename `proc_func' member
1657 to `case_func' and update all references.
1658 (procedure) Rewrite as one-line wrapper around
1659 internal_procedure().
1660 (struct multipass_aux_data) New.
1661 (multipass_callback) Renamed multipass_case_func(). Use struct
1662 multipass_aux_data as auxiliary data.
1663 (multipass_end_func) New function.
1664 (multipass_procedure) Rewrite as wrapper for internal_procedure()
1665 that uses multipass_case_func, multipass_end_func.
1666 (internal_procedure) Add `end_func' argument. Move optimization
1667 of trivial case in here. Move call to open_active_file() and
1668 close_active_file() in here. Now assert that vfm_source is
1670 (procedure_with_splits_callback) Rename
1671 split_procedure_case_func().
1672 (split_procedure_end_func) New function.
1673 (multipass_split_callback) Rename multipass_split_case_func.
1674 (multipass_split_end_func) New function.
1675 (discard_variables) No need to test for nonnull vfm_source.
1677 Fri May 5 21:34:02 2006 Ben Pfaff <blp@gnu.org>
1679 Continue reforming procedure execution. Get rid of unused member.
1681 * procedure.c: (struct write_case_data) Remove `cases_analyzed'
1683 (write_case) Don't increment cases_analyzed.
1685 Thu May 4 21:50:11 2006 Ben Pfaff <blp@gnu.org>
1687 Continue reforming procedure execution. In this phase, move
1688 procedure.c and procedure.h from src to src/data. Update
1689 makefiles and #includes accordingly.
1691 * procedure.c: Moved here from src/.
1693 * procedure.h: Moved here from src/.
1695 Wed May 3 22:42:12 2006 Ben Pfaff <blp@gnu.org>
1697 Continue reforming procedure execution. In this phase, get rid of
1698 many global variables, consolidating procedure execution in
1699 procedure.c. Encapsulate transformations in new "struct
1700 trns_chain". Also, change implementation of N OF CASES, FILTER,
1701 and PROCESS IF from special cases to transformations.
1703 * automake.mk: (src_data_libdata_a_SOURCES) Add transformations.c,
1706 * dictionary.c: (global variable default_dict) Move to
1709 * variable.h: (TRNS_*) Move to transformations.h.
1710 (struct transformation) Move to transformations.c.
1712 Thu May 4 13:47:06 WST 2006 John Darrington <john@darrington.wattle.id.au>
1714 * sys-file-reader.c: Fixed invalid read problems.
1716 Tue May 2 15:57:10 2006 Ben Pfaff <blp@gnu.org>
1718 * storage-stream.c: Add missing function comments.
1720 Tue May 2 15:50:21 2006 Ben Pfaff <blp@gnu.org>
1722 Continue reforming procedure execution. In this phase, add some
1723 new, needed functionality to storage-stream.
1725 * storage-stream.c: (storage_source_decapsulate) New function.
1727 Tue May 2 15:43:36 2006 Ben Pfaff <blp@gnu.org>
1729 * variable.c (width_to_bytes): Declarations must precede
1730 statements for C90 compliance.
1732 Tue May 2 10:42:05 WST 2006 John Darrington <john@darrington.wattle.id.au>
1734 * data-out.c, data-in.c, variable.c, variable.h: New functions
1735 copy_mangle and copy_demangle for reading/writing cases; emulates the
1736 way SPSS deals with strings > 255 bytes.
1738 * sys-file-reader.c sys-file-writer.c: Added support for Record 7,
1739 subtype 14 needed for strings longer than 255 bytes.
1741 * dictionary.c, format.def, value.c : Updated to use MAX_STRING
1742 instead of literal values. Also fixed some constness issues.
1744 * format.h: Constness
1746 * sfm-private.h: Renamed the case_size identifier, since I discovered
1747 that SPSS's respect for this variable is very nominal.
1749 Mon May 1 15:45:42 2006 Ben Pfaff <blp@gnu.org>
1751 Change case limit type from int to size_t.
1753 * dictionary.c: (struct dictionary) Change type of case_limit
1755 (dict_get_case_limit) Change return type.
1756 (dict_set_case_limit) Change parameter type.
1758 Wed Apr 26 20:01:19 2006 Ben Pfaff <blp@gnu.org>
1760 * variable.h: (struct variable) Rename `reinit' member as `leave'
1761 and invert sense. Fix up all references.
1763 Wed Apr 26 19:39:28 2006 Ben Pfaff <blp@gnu.org>
1765 Continue reforming procedure execution. In this phase, break
1766 procedure.c into multiple files.
1768 * automake.mk: (src_data_libdata_a_SOURCES) Add all the new files.
1770 * case-sink.c: New file.
1772 * case-sink.h: New file.
1774 * case-source.c: New file.
1776 * case-source.h: New file.
1778 * storage-stream.c: New file.
1780 * storage-stream.h: New file.
1782 Wed Apr 26 14:55:19 2006 Ben Pfaff <blp@gnu.org>
1784 * variable.h: (struct variable) Remove `init' member and all
1785 references to it from other files. It was initialized in several
1786 places, but nothing really ever used it for anything worthwhile.
1787 Thanks to Jason Stover for pointing out how confusing this
1790 Sun Apr 23 22:04:45 2006 Ben Pfaff <blp@gnu.org>
1792 Continue reforming error message support. In this phase, get rid
1793 of message "titles" and put the message text in `struct error'.
1794 Now `struct error' encapsulates a message more properly.
1796 * casefile.c: (io_error) Use err_msg() instead of err_vmsg().
1797 Format message ourselves.
1799 * data-in.c: (vdls_error) Ditto.
1801 * por-file-reader.c: (error) Ditto.
1803 * sys-file-reader.c: (corrupt_msg) Ditto.
1805 Sun Apr 16 18:49:51 2006 Ben Pfaff <blp@gnu.org>
1807 GNU standards require "file name" instead of "filename" in
1808 documentation. It's nice for our code to follow the convention
1811 * casefile.c: (struct casefile) Rename `filename' member to
1812 `file_name'. Updated all references.
1814 * file-name.c: [!unix] (struct file_identity) Rename
1815 normalized_filename member to normalized_file_name. Updated all
1818 Sun Apr 16 18:35:33 2006 Ben Pfaff <blp@gnu.org>
1820 We don't really support anything but Unix-like environments well,
1821 so we might as well de-obfuscate by writing directory and path
1822 separators explicitly.
1824 * file-name.h: (macro DIR_SEPARATOR) Removed. Changed all usages
1826 (macro PATH_SEPARATOR) Removed. Changed all usages to just ':'.
1827 (macro DIR_SEPARATOR_STRING) Removed. Changed all usages to just
1829 (macro PATH_SEPARATOR_STRING) Removed. Changed all usages to just
1832 Sun Apr 16 18:28:35 2006 Ben Pfaff <blp@gnu.org>
1834 GNU standards require "file name" instead of "filename" in
1835 documentation. It's nice for our code to follow the convention
1838 * filename.c: Rename to file-name.c.
1840 * filename.h: Rename to file-name.h. Update all inclusions.
1841 Update header guards.
1843 * automake.mk: Update file names.
1845 Sun Apr 16 16:42:47 2006 Ben Pfaff <blp@gnu.org>
1847 * filename.c: (fn_dirname) Renamed fn_dir_name(), all references
1849 (fn_basename) Removed (dead code).
1850 (fn_absolute_p) Renamed fn_is_absolute(), all references updated.
1851 (fn_special_p) Renamed fn_is_special(), all references updated.
1852 (fn_exists_p) Renamed fn_exists(), all references updated.
1854 Sun Apr 16 16:33:58 2006 Ben Pfaff <blp@gnu.org>
1856 * filename.c: (fn_tilde_expand) Rewrite for cleaner code.
1857 Also, now it only tilde-expands file names, not paths.
1858 (fn_search_path) Tilde-expand one directory at a time.
1860 Sun Apr 16 16:28:06 2006 Ben Pfaff <blp@gnu.org>
1862 * filename.c: (fn_search_path) rewrite for cleaner code. Also,
1863 get rid of non-Unixlike version of the code, which has probably
1865 (fn_prepend_dir) Removed (dead code).
1867 * filename.h: (macro DIR_SEPARATOR_STRING) New.
1868 (macro PATH_SEPARATOR_STRING) New.
1869 Sun Apr 16 16:05:28 2006 Ben Pfaff <blp@gnu.org>
1871 Continue reforming error message support. In this phase, we get
1872 rid of VM() and the other msg() support for "verbosity", replacing
1873 it by a new function verbose_msg().
1875 * filename.c: (fn_search_path) Use verbose_msg() instead of
1878 Sat Apr 15 19:53:19 2006 Ben Pfaff <blp@gnu.org>
1880 * sfm-private.h: Get rid of #defines after #error, which makes no
1883 Sat Apr 15 19:48:57 2006 Ben Pfaff <blp@gnu.org>
1885 Get rid of our own int32 type in favor of the standard int32_t
1888 * sfm-private.h: (int32 macro) Don't define this anymore. Do
1891 * sys-file-reader.c: Use int32_t instead of int32 throughout.
1893 * sys-file-writer.c: Use int32_t instead of int32 throughout.
1895 Sat Apr 15 19:36:47 2006 Ben Pfaff <blp@gnu.org>
1897 Remove ill-considered file routines that are no longer used.
1899 * filename.c: (fn_open_ext) Removed.
1900 (fn_close_ext) Removed.
1902 * filename.h: (struct file_ext) Removed.
1904 Mon Apr 3 13:22:39 2006 Ben Pfaff <blp@gnu.org>
1906 * variable.c (var_is_valid_name): Move declarations before code
1909 Tue Apr 4 15:28:40 WST 2006 John Darrington <john@darrington.wattle.id.au>
1911 * filename.ch (fn_interp_vars): Fixed small buglet.
1913 Tue Mar 28 13:47:16 WST 2006 John Darrington <john@darrington.wattle.id.au>
1915 * filename.[ch] (fn_interp_vars): Changed the signature and semantics
1916 so as to modify the string inline. Thus makeing it easier to
1917 destroy the results when no longer needed.
1919 2006-03-25 Jason Stover <jhs@math.gcsu.edu>
1921 * category.c (cat_stored_values_destroy): Fixed memory leak.
1923 Fri Mar 24 18:15:41 2006 Ben Pfaff <blp@gnu.org>
1925 Add some missing frees. Thanks to John Darrington for reporting
1928 * any-writer.c (any_writer_close): Free writer.
1930 * any-reader.c (any_reader_close): Free reader.
1932 Mon Mar 20 16:33:53 2006 Ben Pfaff <blp@gnu.org>
1934 * por-file-reader.c: (error) Mark as NO_RETURN.
1936 Sat Mar 11 15:06:07 WST 2006 John Darrington <john@darrington.wattle.id.au>
1938 * settings.c: Changed default value of scompress to true.
1940 Sat Mar 4 13:22:51 2006 Ben Pfaff <blp@gnu.org>
1942 * sfm-private.h: Include variable.h, to get SHORT_NAME_LEN.
1944 * value.h: Remove check on MAX_SHORT_STRING, which I don't think
1947 * variable.h: Move definition of SHORT_NAME_LEN, LONG_NAME_LEN
1948 here from pref.h.orig.
1950 Sat Mar 4 12:50:48 WST 2006 John Darrington <john@darrington.wattle.id.au>
1952 * sys-file-reader.c: Fixed bug reading compressed files.
1954 Thu Mar 2 08:40:33 WST 2006 John Darrington <john@darrington.wattle.id.au>
1956 * Numerous renames. See src/ChangeLog for details.
1958 * Moved files from src directory