projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add details on how various features interact.
[pspp]
/
src
/
var.h
diff --git
a/src/var.h
b/src/var.h
index 277bfde8ad3ccd1f3afda2aa01c2077633f85fe6..60298513c4c61fc3c127cd799aa984944deb8b7e 100644
(file)
--- a/
src/var.h
+++ b/
src/var.h
@@
-151,19
+151,6
@@
struct get_proc
int fv, nv; /* First, # of values. */
};
int fv, nv; /* First, # of values. */
};
-/* Sort order. */
-enum
- {
- SRT_ASCEND, /* A, B, C, ..., X, Y, Z. */
- SRT_DESCEND /* Z, Y, X, ..., C, B, A. */
- };
-
-/* SORT CASES private data. */
-struct sort_cases_proc
- {
- int order; /* SRT_ASCEND or SRT_DESCEND. */
- };
-
/* MEANS private data. */
struct means_proc
{
/* MEANS private data. */
struct means_proc
{
@@
-263,7
+250,6
@@
struct variable
struct frequencies_proc frq;
struct list_proc lst;
struct means_proc mns;
struct frequencies_proc frq;
struct list_proc lst;
struct means_proc mns;
- struct sort_cases_proc srt;
struct matrix_data_proc mxd;
struct match_files_proc mtf;
struct t_test_proc t_t;
struct matrix_data_proc mxd;
struct match_files_proc mtf;
struct t_test_proc t_t;
@@
-302,6
+288,13
@@
struct ccase
{
union value data[1];
};
{
union value data[1];
};
+
+/* Linked list of cases. */
+struct case_list
+ {
+ struct case_list *next;
+ struct ccase c;
+ };
\f
/* Dictionary. */
\f
/* Dictionary. */
@@
-412,6
+405,7
@@
void cancel_temporary (void);
/* Functions. */
void dump_split_vars (const struct ccase *);
/* Functions. */
void dump_split_vars (const struct ccase *);
+typedef int (* is_missing_func )(const union value *, const struct variable *);
int is_num_user_missing (double, const struct variable *);
int is_str_user_missing (const unsigned char[], const struct variable *);
int is_num_user_missing (double, const struct variable *);
int is_str_user_missing (const unsigned char[], const struct variable *);
@@
-422,17
+416,16
@@
void copy_missing_values (struct variable *dest, const struct variable *src);
\f
/* Transformations. */
\f
/* Transformations. */
+struct trns_header;
+typedef int trns_proc_func (struct trns_header *, struct ccase *, int);
+typedef void trns_free_func (struct trns_header *);
+
/* Header for all transformations. */
struct trns_header
{
/* Header for all transformations. */
struct trns_header
{
- /* Index into t_trns[]. */
- int index;
-
- /* Transformation proc. */
- int (*proc) (struct trns_header *, struct ccase *);
-
- /* Garbage collector proc. */
- void (*free) (struct trns_header *);
+ int index; /* Index into t_trns[]. */
+ trns_proc_func *proc; /* Transformation proc. */
+ trns_free_func *free; /* Garbage collector proc. */
};
/* Array of transformations */
};
/* Array of transformations */