X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdictionary.h;h=9a4e8bf1c9c8f8f881dc1acf4864d328ee60a7c2;hb=df1d194af32e35739355981252785e768f21ebb0;hp=1166fcd280b04ec05dda3ac7dc7033d41133f666;hpb=8180c5dd1591446174c0753ee960921786113403;p=pspp diff --git a/src/data/dictionary.h b/src/data/dictionary.h index 1166fcd280..9a4e8bf1c9 100644 --- a/src/data/dictionary.h +++ b/src/data/dictionary.h @@ -27,27 +27,28 @@ struct ccase; /* Creating dictionaries. */ struct dictionary *dict_create (const char *encoding); -struct dictionary *dict_clone (const struct dictionary *); +struct dictionary *dict_clone (const struct dictionary *) WARN_UNUSED_RESULT; +struct dictionary *dict_ref (struct dictionary *s) WARN_UNUSED_RESULT; /* Clearing and destroying dictionaries. */ void dict_clear (struct dictionary *); -void dict_destroy (struct dictionary *); +void dict_unref (struct dictionary *); /* Common ways to access variables. */ struct variable *dict_lookup_var (const struct dictionary *, const char *); struct variable *dict_lookup_var_assert (const struct dictionary *, const char *); struct variable *dict_get_var (const struct dictionary *, size_t position); -size_t dict_get_var_cnt (const struct dictionary *); +size_t dict_get_n_vars (const struct dictionary *); /* Other access to variables. */ bool dict_contains_var (const struct dictionary *, const struct variable *); void dict_get_vars (const struct dictionary *, - const struct variable ***vars, size_t *cnt, + const struct variable ***vars, size_t *n_vars, enum dict_class exclude); void dict_get_vars_mutable (const struct dictionary *, - struct variable ***vars, size_t *cnt, + struct variable ***vars, size_t *n_vars, enum dict_class exclude); /* Creating variables. */ @@ -91,11 +92,17 @@ bool dict_rename_vars (struct dictionary *, char *dict_make_unique_var_name (const struct dictionary *, const char *hint, unsigned long int *num_start); +bool dict_get_names_must_be_ids (const struct dictionary *); +void dict_set_names_must_be_ids (struct dictionary *, bool); + /* Weight variable. */ double dict_get_case_weight (const struct dictionary *, const struct ccase *, bool *); +double dict_get_rounded_case_weight (const struct dictionary *, + const struct ccase *, bool *); struct variable *dict_get_weight (const struct dictionary *); void dict_set_weight (struct dictionary *, struct variable *); +struct fmt_spec dict_get_weight_format (const struct dictionary *); /* Filter variable. */ struct variable *dict_get_filter (const struct dictionary *); @@ -118,11 +125,23 @@ void dict_compact_values (struct dictionary *); struct caseproto *dict_get_compacted_proto (const struct dictionary *, unsigned int exclude_classes); -/* SPLIT FILE variables. */ +/* SPLIT FILE variables. + + SPLIT_NONE is used if and only if there are no split file variables. */ +enum split_type + { + SPLIT_NONE, /* No split file variables. */ + SPLIT_SEPARATE, /* Produce separate output for each split. */ + SPLIT_LAYERED, /* Output splits in same table. */ + }; +#define MAX_SPLITS 8 const struct variable *const *dict_get_split_vars (const struct dictionary *); -size_t dict_get_split_cnt (const struct dictionary *); +size_t dict_get_n_splits (const struct dictionary *); +enum split_type dict_get_split_type (const struct dictionary *); void dict_set_split_vars (struct dictionary *, - struct variable *const *, size_t cnt); + struct variable *const *, size_t n, + enum split_type); +void dict_clear_split_vars (struct dictionary *); /* File label. */ const char *dict_get_label (const struct dictionary *); @@ -138,16 +157,16 @@ void dict_clear_documents (struct dictionary *); bool dict_add_document_line (struct dictionary *, const char *, bool issue_warning); -size_t dict_get_document_line_cnt (const struct dictionary *); +size_t dict_get_document_n_lines (const struct dictionary *); const char *dict_get_document_line (const struct dictionary *, size_t); /* Vectors. */ bool dict_create_vector (struct dictionary *, const char *name, - struct variable **, size_t cnt); + struct variable **, size_t n); void dict_create_vector_assert (struct dictionary *, const char *name, - struct variable **, size_t cnt); + struct variable **, size_t n); const struct vector *dict_get_vector (const struct dictionary *, size_t idx); -size_t dict_get_vector_cnt (const struct dictionary *); +size_t dict_get_n_vectors (const struct dictionary *); const struct vector *dict_lookup_vector (const struct dictionary *, const char *name); void dict_clear_vectors (struct dictionary *); @@ -162,6 +181,16 @@ bool dict_add_mrset (struct dictionary *, struct mrset *); bool dict_delete_mrset (struct dictionary *, const char *name); void dict_clear_mrsets (struct dictionary *); +/* Variable sets. */ +const struct varset *dict_get_varset (const struct dictionary *, size_t idx); +size_t dict_get_n_varsets (const struct dictionary *); +const struct varset *dict_lookup_varset (const struct dictionary *, + const char *name); + +bool dict_add_varset (struct dictionary *, struct varset *); +bool dict_delete_varset (struct dictionary *, const char *name); +void dict_clear_varsets (struct dictionary *); + /* Attributes. */ struct attrset *dict_get_attributes (const struct dictionary *); void dict_set_attributes (struct dictionary *, const struct attrset *); @@ -170,8 +199,9 @@ bool dict_has_attributes (const struct dictionary *); /* Data encoding. */ const char *dict_get_encoding (const struct dictionary *d); -bool dict_id_is_valid (const struct dictionary *, const char *id, - bool issue_error); +char *dict_id_is_valid__ (const struct dictionary *, const char *id) + WARN_UNUSED_RESULT; +bool dict_id_is_valid (const struct dictionary *, const char *id); /* Internal variables. */ struct variable *dict_create_internal_var (int case_idx, int width);