projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intern: Use UP_CAST macro instad of open-coding it.
[pspp]
/
src
/
language
/
stats
/
autorecode.c
diff --git
a/src/language/stats/autorecode.c
b/src/language/stats/autorecode.c
index 05016548e37b4d98cb6cedb6e3416f891cf763e3..a4d34ccf608e7c784334d6a23546da546df1f095 100644
(file)
--- a/
src/language/stats/autorecode.c
+++ b/
src/language/stats/autorecode.c
@@
-20,18
+20,18
@@
#include "data/case.h"
#include "data/casereader.h"
#include "data/case.h"
#include "data/casereader.h"
+#include "data/dataset.h"
#include "data/dictionary.h"
#include "data/dictionary.h"
-#include "data/procedure.h"
#include "data/transformations.h"
#include "data/variable.h"
#include "language/command.h"
#include "language/lexer/lexer.h"
#include "language/lexer/variable-parser.h"
#include "libpspp/array.h"
#include "data/transformations.h"
#include "data/variable.h"
#include "language/command.h"
#include "language/lexer/lexer.h"
#include "language/lexer/variable-parser.h"
#include "libpspp/array.h"
-#include "libpspp/i18n.h"
#include "libpspp/compiler.h"
#include "libpspp/hash-functions.h"
#include "libpspp/hmap.h"
#include "libpspp/compiler.h"
#include "libpspp/hash-functions.h"
#include "libpspp/hmap.h"
+#include "libpspp/i18n.h"
#include "libpspp/message.h"
#include "libpspp/pool.h"
#include "libpspp/str.h"
#include "libpspp/message.h"
#include "libpspp/pool.h"
#include "libpspp/str.h"
@@
-49,6
+49,8
@@
struct arc_item
{
struct hmap_node hmap_node; /* Element in "struct arc_spec" hash table. */
union value from; /* Original value. */
{
struct hmap_node hmap_node; /* Element in "struct arc_spec" hash table. */
union value from; /* Original value. */
+ int width; /* Width of the original value */
+
double to; /* Recoded value. */
};
double to; /* Recoded value. */
};
@@
-80,9
+82,9
@@
struct autorecode_pgm
static trns_proc_func autorecode_trns_proc;
static trns_free_func autorecode_trns_free;
static trns_proc_func autorecode_trns_proc;
static trns_free_func autorecode_trns_free;
-static int compare_arc_items (const void *, const void *, const void *
width
);
+static int compare_arc_items (const void *, const void *, const void *
aux
);
static void arc_free (struct autorecode_pgm *);
static void arc_free (struct autorecode_pgm *);
-static struct arc_item *find_arc_item (struct arc_spec *, const union value *,
+static struct arc_item *find_arc_item (
const
struct arc_spec *, const union value *,
size_t hash);
/* Performs the AUTORECODE procedure. */
size_t hash);
/* Performs the AUTORECODE procedure. */
@@
-111,14
+113,15
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
/* Parse variable lists. */
lex_match_id (lexer, "VARIABLES");
/* Parse variable lists. */
lex_match_id (lexer, "VARIABLES");
- lex_match (lexer,
'='
);
+ lex_match (lexer,
T_EQUALS
);
if (!parse_variables_const (lexer, dict, &src_vars, &n_srcs,
PV_NO_DUPLICATE))
goto error;
if (!lex_force_match_id (lexer, "INTO"))
goto error;
if (!parse_variables_const (lexer, dict, &src_vars, &n_srcs,
PV_NO_DUPLICATE))
goto error;
if (!lex_force_match_id (lexer, "INTO"))
goto error;
- lex_match (lexer, '=');
- if (!parse_DATA_LIST_vars (lexer, &dst_names, &n_dsts, PV_NO_DUPLICATE))
+ lex_match (lexer, T_EQUALS);
+ if (!parse_DATA_LIST_vars (lexer, dict, &dst_names, &n_dsts,
+ PV_NO_DUPLICATE))
goto error;
if (n_dsts != n_srcs)
{
goto error;
if (n_dsts != n_srcs)
{
@@
-141,7
+144,7
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
}
/* Parse options. */
}
/* Parse options. */
- while (lex_match (lexer,
'/'
))
+ while (lex_match (lexer,
T_SLASH
))
{
if (lex_match_id (lexer, "DESCENDING"))
direction = DESCENDING;
{
if (lex_match_id (lexer, "DESCENDING"))
direction = DESCENDING;
@@
-154,7
+157,7
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
}
}
}
}
- if (lex_token (lexer) !=
'.'
)
+ if (lex_token (lexer) !=
T_ENDCMD
)
{
lex_error (lexer, _("expecting end of command"));
goto error;
{
lex_error (lexer, _("expecting end of command"));
goto error;
@@
-195,6
+198,7
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
if (item == NULL)
{
item = xmalloc (sizeof *item);
if (item == NULL)
{
item = xmalloc (sizeof *item);
+ item->width = width;
value_clone (&item->from, value, width);
hmap_insert (spec->items, &item->hmap_node, hash);
}
value_clone (&item->from, value, width);
hmap_insert (spec->items, &item->hmap_node, hash);
}
@@
-209,7
+213,6
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
struct arc_item **items;
struct arc_item *item;
size_t n_items;
struct arc_item **items;
struct arc_item *item;
size_t n_items;
- int src_width;
size_t j;
/* Create destination variable. */
size_t j;
/* Create destination variable. */
@@
-221,12
+224,11
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
j = 0;
HMAP_FOR_EACH (item, struct arc_item, hmap_node, spec->items)
items[j++] = item;
j = 0;
HMAP_FOR_EACH (item, struct arc_item, hmap_node, spec->items)
items[j++] = item;
- if (!arc->global_items)
-
assert (j == n_items);
+
+ assert (j == n_items);
/* Sort array by value. */
/* Sort array by value. */
- src_width = var_get_width (spec->src);
- sort (items, n_items, sizeof *items, compare_arc_items, &src_width);
+ sort (items, n_items, sizeof *items, compare_arc_items, NULL);
/* Assign recoded values in sorted order. */
for (j = 0; j < n_items; j++)
/* Assign recoded values in sorted order. */
for (j = 0; j < n_items; j++)
@@
-235,7
+237,7
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
size_t len;
char *recoded_value = NULL;
char *c;
size_t len;
char *recoded_value = NULL;
char *c;
-
+ const int src_width = items[j]->width;
union value to_val;
value_init (&to_val, 0);
union value to_val;
value_init (&to_val, 0);
@@
-245,10
+247,9
@@
cmd_autorecode (struct lexer *lexer, struct dataset *ds)
/* Add value labels to the destination variable which indicate
the source value from whence the new value comes. */
/* Add value labels to the destination variable which indicate
the source value from whence the new value comes. */
-
if (src_width > 0)
{
if (src_width > 0)
{
- const char *str =
(const char *) value_str (from, src_width
);
+ const char *str =
CHAR_CAST_BUG (const char*, value_str (from, src_width)
);
recoded_value = recode_string (UTF8, dict_get_encoding (dict), str, src_width);
}
recoded_value = recode_string (UTF8, dict_get_encoding (dict), str, src_width);
}
@@
-294,13
+295,12
@@
arc_free (struct autorecode_pgm *arc)
for (i = 0; i < arc->n_specs; i++)
{
struct arc_spec *spec = &arc->specs[i];
for (i = 0; i < arc->n_specs; i++)
{
struct arc_spec *spec = &arc->specs[i];
- int width = var_get_width (spec->src);
struct arc_item *item, *next;
HMAP_FOR_EACH_SAFE (item, next, struct arc_item, hmap_node,
spec->items)
{
struct arc_item *item, *next;
HMAP_FOR_EACH_SAFE (item, next, struct arc_item, hmap_node,
spec->items)
{
- value_destroy (&item->from, width);
+ value_destroy (&item->from,
item->
width);
hmap_delete (spec->items, &item->hmap_node);
free (item);
}
hmap_delete (spec->items, &item->hmap_node);
free (item);
}
@@
-329,7
+329,7
@@
arc_free (struct autorecode_pgm *arc)
}
static struct arc_item *
}
static struct arc_item *
-find_arc_item (struct arc_spec *spec, const union value *value,
+find_arc_item (
const
struct arc_spec *spec, const union value *value,
size_t hash)
{
struct arc_item *item;
size_t hash)
{
struct arc_item *item;
@@
-341,13
+341,24
@@
find_arc_item (struct arc_spec *spec, const union value *value,
}
static int
}
static int
-compare_arc_items (const void *a_, const void *b_, const void *
width_
)
+compare_arc_items (const void *a_, const void *b_, const void *
aux UNUSED
)
{
const struct arc_item *const *a = a_;
const struct arc_item *const *b = b_;
{
const struct arc_item *const *a = a_;
const struct arc_item *const *b = b_;
- const int *width = width_;
+ int width_a = (*a)->width;
+ int width_b = (*b)->width;
+
+ if ( width_a == width_b)
+ return value_compare_3way (&(*a)->from, &(*b)->from, width_a);
+
+ if ( width_a == 0 && width_b != 0)
+ return -1;
- return value_compare_3way (&(*a)->from, &(*b)->from, *width);
+ if ( width_b == 0 && width_a != 0)
+ return +1;
+
+ return buf_compare_rpad (CHAR_CAST_BUG (const char *, value_str (&(*a)->from, width_a)), width_a,
+ CHAR_CAST_BUG (const char *, value_str (&(*b)->from, width_b)), width_b);
}
static int
}
static int
@@
-360,7
+371,7
@@
autorecode_trns_proc (void *arc_, struct ccase **c,
*c = case_unshare (*c);
for (i = 0; i < arc->n_specs; i++)
{
*c = case_unshare (*c);
for (i = 0; i < arc->n_specs; i++)
{
- struct arc_spec *spec = &arc->specs[i];
+
const
struct arc_spec *spec = &arc->specs[i];
int width = var_get_width (spec->src);
const union value *value = case_data (*c, spec->src);
struct arc_item *item;
int width = var_get_width (spec->src);
const union value *value = case_data (*c, spec->src);
struct arc_item *item;