projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into import-gui
[pspp]
/
src
/
language
/
stats
/
autorecode.c
diff --git
a/src/language/stats/autorecode.c
b/src/language/stats/autorecode.c
index 3331d74569ad2a4ba475bdc9cb57aba0b68c3dca..b2c4d4844c5c6cd083b54f0055d5a204c72baa7c 100644
(file)
--- a/
src/language/stats/autorecode.c
+++ b/
src/language/stats/autorecode.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009, 2010
, 2012
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
@@
-37,9
+37,10
@@
#include "libpspp/str.h"
#include "gl/xalloc.h"
#include "libpspp/str.h"
#include "gl/xalloc.h"
-#include "gl/
vasn
printf.h"
+#include "gl/
c-xvas
printf.h"
#include "gl/mbiter.h"
#include "gl/mbiter.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-60,7
+61,7
@@
struct arc_spec
{
const struct variable *src; /* Source variable. */
struct variable *dst; /* Target variable. */
{
const struct variable *src; /* Source variable. */
struct variable *dst; /* Target variable. */
- struct
hmap *items; /* Hash table of "struct arc_item"s. */
+ struct
rec_items *items;
};
/* Descending or ascending sort order. */
};
/* Descending or ascending sort order. */
@@
-70,6
+71,14
@@
enum arc_direction
DESCENDING
};
DESCENDING
};
+struct rec_items
+{
+ struct hmap ht; /* Hash table of "struct arc_item"s. */
+ int refcnt;
+};
+
+
+
/* AUTORECODE data. */
struct autorecode_pgm
{
/* AUTORECODE data. */
struct autorecode_pgm
{
@@
-77,7
+86,7
@@
struct autorecode_pgm
size_t n_specs;
/* Hash table of "struct arc_item"s. */
size_t n_specs;
/* Hash table of "struct arc_item"s. */
- struct
hmap
*global_items;
+ struct
rec_items
*global_items;
bool blank_valid;
const struct dictionary *dict;
bool blank_valid;
const struct dictionary *dict;
@@
-126,7
+135,6
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
size_t n_dsts = 0;
enum arc_direction direction = ASCENDING;
size_t n_dsts = 0;
enum arc_direction direction = ASCENDING;
- bool print = true;
struct casereader *input;
struct ccase *c;
struct casereader *input;
struct ccase *c;
@@
-177,11
+185,14
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
if (lex_match_id (lexer, "DESCENDING"))
direction = DESCENDING;
else if (lex_match_id (lexer, "PRINT"))
if (lex_match_id (lexer, "DESCENDING"))
direction = DESCENDING;
else if (lex_match_id (lexer, "PRINT"))
- print = true;
+ {
+ /* Not yet implemented. */
+ }
else if (lex_match_id (lexer, "GROUP"))
{
arc->global_items = xmalloc (sizeof (*arc->global_items));
else if (lex_match_id (lexer, "GROUP"))
{
arc->global_items = xmalloc (sizeof (*arc->global_items));
- hmap_init (arc->global_items);
+ arc->global_items->refcnt = 1;
+ hmap_init (&arc->global_items->ht);
}
else if (lex_match_id (lexer, "BLANK"))
{
}
else if (lex_match_id (lexer, "BLANK"))
{
@@
-216,14
+227,17
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
struct arc_spec *spec = &arc->specs[i];
spec->src = src_vars[i];
struct arc_spec *spec = &arc->specs[i];
spec->src = src_vars[i];
+
if (arc->global_items)
{
if (arc->global_items)
{
+ arc->global_items->refcnt++;
spec->items = arc->global_items;
}
else
{
spec->items = arc->global_items;
}
else
{
- spec->items = xmalloc (sizeof (*spec->items));
- hmap_init (spec->items);
+ spec->items = xzalloc (sizeof (*spec->items));
+ spec->items->refcnt = 1;
+ hmap_init (&spec->items->ht);
}
}
}
}
@@
-248,7
+262,7
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
item = xmalloc (sizeof *item);
item->width = width;
value_clone (&item->from, value, width);
item = xmalloc (sizeof *item);
item->width = width;
value_clone (&item->from, value, width);
- hmap_insert (
spec->items
, &item->hmap_node, hash);
+ hmap_insert (
&spec->items->ht
, &item->hmap_node, hash);
}
}
ok = casereader_destroy (input);
}
}
ok = casereader_destroy (input);
@@
-267,10
+281,10
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
spec->dst = dict_create_var_assert (dict, dst_names[i], 0);
/* Create array of pointers to items. */
spec->dst = dict_create_var_assert (dict, dst_names[i], 0);
/* Create array of pointers to items. */
- n_items = hmap_count (
spec->items
);
+ n_items = hmap_count (
&spec->items->ht
);
items = xmalloc (n_items * sizeof *items);
j = 0;
items = xmalloc (n_items * sizeof *items);
j = 0;
- HMAP_FOR_EACH (item, struct arc_item, hmap_node,
spec->items
)
+ HMAP_FOR_EACH (item, struct arc_item, hmap_node,
&spec->items->ht
)
items[j++] = item;
assert (j == n_items);
items[j++] = item;
assert (j == n_items);
@@
-282,7
+296,6
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
for (j = 0; j < n_items; j++)
{
const union value *from = &items[j]->from;
for (j = 0; j < n_items; j++)
{
const union value *from = &items[j]->from;
- size_t len;
char *recoded_value = NULL;
char *c;
const int src_width = items[j]->width;
char *recoded_value = NULL;
char *c;
const int src_width = items[j]->width;
@@
-302,7
+315,7
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
recoded_value = recode_string (UTF8, dict_get_encoding (arc->dict), str, src_width);
}
else
recoded_value = recode_string (UTF8, dict_get_encoding (arc->dict), str, src_width);
}
else
- recoded_value =
asnprintf (NULL, &len,
"%g", from->f);
+ recoded_value =
c_xasprintf (
"%g", from->f);
/* Remove trailing whitespace */
for (c = recoded_value; *c != '\0'; c++)
/* Remove trailing whitespace */
for (c = recoded_value; *c != '\0'; c++)
@@
-351,31
+364,31
@@
arc_free (struct autorecode_pgm *arc)
struct arc_item *item, *next;
HMAP_FOR_EACH_SAFE (item, next, struct arc_item, hmap_node,
struct arc_item *item, *next;
HMAP_FOR_EACH_SAFE (item, next, struct arc_item, hmap_node,
-
spec->items
)
+
&spec->items->ht
)
{
value_destroy (&item->from, item->width);
{
value_destroy (&item->from, item->width);
- hmap_delete (
spec->items
, &item->hmap_node);
+ hmap_delete (
&spec->items->ht
, &item->hmap_node);
free (item);
}
}
free (item);
}
}
- if (arc->global_items)
- {
- free (arc->global_items);
- }
- else
+ for (i = 0; i < arc->n_specs; i++)
{
{
- for (i = 0; i < arc->n_specs; i++)
+ struct arc_spec *spec = &arc->specs[i];
+
+ if (--spec->items->refcnt == 0)
{
{
- struct arc_spec *spec = &arc->specs[i];
- if (spec->items)
- {
- hmap_destroy (spec->items);
- free (spec->items);
- }
+ hmap_destroy (&spec->items->ht);
+ free (spec->items);
}
}
}
}
+ if (arc->global_items && --arc->global_items->refcnt == 0)
+ {
+ hmap_destroy (&arc->global_items->ht);
+ free (arc->global_items);
+ }
+
free (arc->specs);
free (arc);
}
free (arc->specs);
free (arc);
}
@@
-387,7
+400,7
@@
find_arc_item (const struct arc_spec *spec, const union value *value,
{
struct arc_item *item;
{
struct arc_item *item;
- HMAP_FOR_EACH_WITH_HASH (item, struct arc_item, hmap_node, hash,
spec->items
)
+ HMAP_FOR_EACH_WITH_HASH (item, struct arc_item, hmap_node, hash,
&spec->items->ht
)
if (value_equal (value, &item->from, var_get_width (spec->src)))
return item;
return NULL;
if (value_equal (value, &item->from, var_get_width (spec->src)))
return item;
return NULL;