projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dict: Make dict_clone_var(), dict_clone_var_assert() not rename variables.
[pspp]
/
src
/
data
/
dictionary.h
diff --git
a/src/data/dictionary.h
b/src/data/dictionary.h
index 682409e24216a11c7492cb39082b30d62f101f19..780d5a9412823d0bbf4ab3993a6d5df07f4af228 100644
(file)
--- a/
src/data/dictionary.h
+++ b/
src/data/dictionary.h
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2007
, 2009, 2010
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-56,10
+56,14
@@
struct variable *dict_create_var (struct dictionary *, const char *,
int width);
struct variable *dict_create_var_assert (struct dictionary *, const char *,
int width);
int width);
struct variable *dict_create_var_assert (struct dictionary *, const char *,
int width);
-struct variable *dict_clone_var (struct dictionary *, const struct variable *,
- const char *);
+struct variable *dict_clone_var (struct dictionary *, const struct variable *);
struct variable *dict_clone_var_assert (struct dictionary *,
struct variable *dict_clone_var_assert (struct dictionary *,
- const struct variable *, const char *);
+ const struct variable *);
+struct variable *dict_clone_var_as (struct dictionary *,
+ const struct variable *, const char *);
+struct variable *dict_clone_var_as_assert (struct dictionary *,
+ const struct variable *,
+ const char *);
/* Deleting variables. */
void dict_delete_var (struct dictionary *, struct variable *);
/* Deleting variables. */
void dict_delete_var (struct dictionary *, struct variable *);
@@
-99,6
+103,7
@@
casenumber dict_get_case_limit (const struct dictionary *);
void dict_set_case_limit (struct dictionary *, casenumber);
/* Size of cases for this dictionary. */
void dict_set_case_limit (struct dictionary *, casenumber);
/* Size of cases for this dictionary. */
+const struct caseproto *dict_get_proto (const struct dictionary *);
int dict_get_next_value_idx (const struct dictionary *);
size_t dict_get_case_size (const struct dictionary *);
int dict_get_next_value_idx (const struct dictionary *);
size_t dict_get_case_size (const struct dictionary *);
@@
-107,6
+112,8
@@
size_t dict_get_case_size (const struct dictionary *);
size_t dict_count_values (const struct dictionary *,
unsigned int exclude_classes);
void dict_compact_values (struct dictionary *);
size_t dict_count_values (const struct dictionary *,
unsigned int exclude_classes);
void dict_compact_values (struct dictionary *);
+struct caseproto *dict_get_compacted_proto (const struct dictionary *,
+ unsigned int exclude_classes);
/* SPLIT FILE variables. */
const struct variable *const *dict_get_split_vars (const struct dictionary *);
/* SPLIT FILE variables. */
const struct variable *const *dict_get_split_vars (const struct dictionary *);
@@
-147,6
+154,11
@@
struct attrset *dict_get_attributes (const struct dictionary *);
void dict_set_attributes (struct dictionary *, const struct attrset *);
bool dict_has_attributes (const struct dictionary *);
void dict_set_attributes (struct dictionary *, const struct attrset *);
bool dict_has_attributes (const struct dictionary *);
+
+void dict_set_encoding (struct dictionary *d, const char *enc);
+const char *dict_get_encoding (const struct dictionary *d);
+
+
/* Functions to be called upon dictionary changes. */
struct dict_callbacks
{
/* Functions to be called upon dictionary changes. */
struct dict_callbacks
{
@@
-164,6
+176,11
@@
void dict_set_callbacks (struct dictionary *, const struct dict_callbacks *,
void *);
void dict_copy_callbacks (struct dictionary *, const struct dictionary *);
void *);
void dict_copy_callbacks (struct dictionary *, const struct dictionary *);
+void dict_set_change_callback (struct dictionary *d,
+ void (*changed) (struct dictionary *, void*),
+ void *data);
+
+
/* Debug use only. */
void dict_dump (const struct dictionary *);
/* Debug use only. */
void dict_dump (const struct dictionary *);