-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include <language/lexer/variable-parser.h>
+#include "language/lexer/variable-parser.h"
#include <ctype.h>
#include <stdbool.h>
#include <stdlib.h>
-#include "lexer.h"
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <libpspp/alloc.h>
-#include <libpspp/assertion.h>
-#include <libpspp/bit-vector.h>
-#include <libpspp/hash.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/hash-functions.h"
+#include "libpspp/hmapx.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
+static struct variable * var_set_get_var (const struct var_set *, size_t );
+
+static struct variable *var_set_lookup_var (const struct var_set *,
+ const char *);
+
+static bool var_set_lookup_var_idx (const struct var_set *, const char *,
+ size_t *);
+
+
+
/* Parses a name as a variable within VS. Sets *IDX to the
variable's index and returns true if successful. On failure
emits an error message and returns false. */
static bool
-parse_vs_variable_idx (struct lexer *lexer, const struct var_set *vs,
+parse_vs_variable_idx (struct lexer *lexer, const struct var_set *vs,
size_t *idx)
{
assert (idx != NULL);
-
+
if (lex_token (lexer) != T_ID)
{
lex_error (lexer, _("expecting variable name"));
return false;
}
- else if (var_set_lookup_var_idx (vs, lex_tokid (lexer), idx))
+ else if (var_set_lookup_var_idx (vs, lex_tokid (lexer), idx))
{
lex_get (lexer);
return true;
}
- else
+ else
{
msg (SE, _("%s is not a variable name."), lex_tokid (lexer));
return false;
variable if successful. On failure emits an error message and
returns a null pointer. */
struct variable *
-parse_variable (struct lexer *lexer, const struct dictionary *d)
+parse_variable (struct lexer *lexer, const struct dictionary *d)
{
struct var_set *vs = var_set_create_from_dict (d);
struct variable *var = parse_vs_variable (lexer, vs);
number of variables into *CNT. Returns true only if
successful. */
bool
-parse_variables (struct lexer *lexer, const struct dictionary *d,
+parse_variables (struct lexer *lexer, const struct dictionary *d,
struct variable ***var,
- size_t *cnt, int opts)
+ size_t *cnt, int opts)
{
struct var_set *vs;
int success;
vs = var_set_create_from_dict (d);
success = parse_var_set_vars (lexer, vs, var, cnt, opts);
- if ( success == 0 )
- free ( *var ) ;
var_set_destroy (vs);
return success;
}
successful. Same behavior as parse_variables, except that all
allocations are taken from the given POOL. */
bool
-parse_variables_pool (struct lexer *lexer, struct pool *pool,
+parse_variables_pool (struct lexer *lexer, struct pool *pool,
const struct dictionary *dict,
- struct variable ***vars, size_t *var_cnt, int opts)
+ struct variable ***vars, size_t *var_cnt, int opts)
{
int retval;
already in the pool, which would attempt to re-free it
later. */
assert (!(opts & PV_APPEND));
-
+
retval = parse_variables (lexer, dict, vars, var_cnt, opts);
if (retval)
pool_register (pool, free, *vars);
dictionary class, and returns true. Returns false on
failure. */
static bool
-parse_var_idx_class (struct lexer *lexer, const struct var_set *vs,
+parse_var_idx_class (struct lexer *lexer, const struct var_set *vs,
size_t *idx,
enum dict_class *class)
{
struct variable *add = var_set_get_var (vs, idx);
const char *add_name = var_get_name (add);
- if ((pv_opts & PV_NUMERIC) && !var_is_numeric (add))
+ if ((pv_opts & PV_NUMERIC) && !var_is_numeric (add))
msg (SW, _("%s is not a numeric variable. It will not be "
"included in the variable list."), add_name);
- else if ((pv_opts & PV_STRING) && !var_is_alpha (add))
+ else if ((pv_opts & PV_STRING) && !var_is_alpha (add))
msg (SE, _("%s is not a string variable. It will not be "
"included in the variable list."), add_name);
else if ((pv_opts & PV_NO_SCRATCH)
msg (SE, _("Scratch variables (such as %s) are not allowed "
"here."), add_name);
else if ((pv_opts & (PV_SAME_TYPE | PV_SAME_WIDTH)) && *nv
- && var_get_type (add) != var_get_type ((*v)[0]))
+ && var_get_type (add) != var_get_type ((*v)[0]))
msg (SE, _("%s and %s are not the same type. All variables in "
"this variable list must be of the same type. %s "
"will be omitted from the list."),
&& var_get_width (add) != var_get_width ((*v)[0]))
msg (SE, _("%s and %s are string variables with different widths. "
"All variables in this variable list must have the "
- "same width. %s will be omttied from the list."),
+ "same width. %s will be omitted from the list."),
var_get_name ((*v)[0]), add_name, add_name);
- else if ((pv_opts & PV_NO_DUPLICATE) && included[idx])
+ else if ((pv_opts & PV_NO_DUPLICATE) && included[idx])
msg (SE, _("Variable %s appears twice in variable list."), add_name);
else if ((pv_opts & PV_DUPLICATE) || !included[idx])
{
add_variables (struct variable ***v, size_t *nv, size_t *mv, char *included,
int pv_opts,
const struct var_set *vs, int first_idx, int last_idx,
- enum dict_class class)
+ enum dict_class class)
{
size_t i;
-
+
for (i = first_idx; i <= last_idx; i++)
if (dict_class_from_id (var_get_name (var_set_get_var (vs, i))) == class)
add_variable (v, nv, mv, included, pv_opts, vs, i);
Conversely, if parse_variables() returns true, then *nv is
nonzero and *v is non-NULL. */
bool
-parse_var_set_vars (struct lexer *lexer, const struct var_set *vs,
+parse_var_set_vars (struct lexer *lexer, const struct var_set *vs,
struct variable ***v, size_t *nv,
int pv_opts)
{
if (!(pv_opts & PV_DUPLICATE))
{
size_t i;
-
+
included = xcalloc (var_set_get_cnt (vs), sizeof *included);
- for (i = 0; i < *nv; i++)
+ for (i = 0; i < *nv; i++)
{
size_t index;
if (!var_set_lookup_var_idx (vs, var_get_name ((*v)[i]), &index))
NOT_REACHED ();
- included[index] = 1;
+ included[index] = 1;
}
}
else
if (lex_match (lexer, T_ALL))
add_variables (v, nv, &mv, included, pv_opts,
vs, 0, var_set_get_cnt (vs) - 1, DC_ORDINARY);
- else
+ else
{
enum dict_class class;
size_t first_idx;
if (!lex_match (lexer, T_TO))
add_variable (v, nv, &mv, included, pv_opts, vs, first_idx);
- else
+ else
{
size_t last_idx;
enum dict_class last_class;
add_variables (v, nv, &mv, included, pv_opts,
vs, first_idx, last_idx, class);
- }
+ }
}
if (pv_opts & PV_SINGLE)
}
while (lex_token (lexer) == T_ALL
|| (lex_token (lexer) == T_ID && var_set_lookup_var (vs, lex_tokid (lexer)) != NULL));
-
+
if (*nv == 0)
goto fail;
int d1, d2;
int n;
size_t nvar, mvar;
- char name1[LONG_NAME_LEN + 1], name2[LONG_NAME_LEN + 1];
- char root1[LONG_NAME_LEN + 1], root2[LONG_NAME_LEN + 1];
+ char name1[VAR_NAME_LEN + 1], name2[VAR_NAME_LEN + 1];
+ char root1[VAR_NAME_LEN + 1], root2[VAR_NAME_LEN + 1];
int success = 0;
assert (names != NULL);
for (n = n1; n <= n2; n++)
{
- char name[LONG_NAME_LEN + 1];
+ char name[VAR_NAME_LEN + 1];
sprintf (name, "%s%0*d", root1, d1, n);
(*names)[nvar] = xstrdup (name);
nvar++;
presumably already in the pool, which would attempt to
re-free it later. */
assert (!(pv_opts & PV_APPEND));
-
+
retval = parse_DATA_LIST_vars (lexer, names, nnames, pv_opts);
if (retval)
register_vars_pool (pool, *names, *nnames);
existing and the rest are to be created. Same args as
parse_DATA_LIST_vars(). */
bool
-parse_mixed_vars (struct lexer *lexer, const struct dictionary *dict,
+parse_mixed_vars (struct lexer *lexer, const struct dictionary *dict,
char ***names, size_t *nnames, int pv_opts)
{
size_t i;
}
\f
/* A set of variables. */
-struct var_set
+struct var_set
{
size_t (*get_cnt) (const struct var_set *);
struct variable *(*get_var) (const struct var_set *, size_t idx);
/* Returns the number of variables in VS. */
size_t
-var_set_get_cnt (const struct var_set *vs)
+var_set_get_cnt (const struct var_set *vs)
{
assert (vs != NULL);
/* Return variable with index IDX in VS.
IDX must be less than the number of variables in VS. */
-struct variable *
-var_set_get_var (const struct var_set *vs, size_t idx)
+static struct variable *
+var_set_get_var (const struct var_set *vs, size_t idx)
{
assert (vs != NULL);
assert (idx < var_set_get_cnt (vs));
/* Returns the variable in VS named NAME, or a null pointer if VS
contains no variable with that name. */
struct variable *
-var_set_lookup_var (const struct var_set *vs, const char *name)
+var_set_lookup_var (const struct var_set *vs, const char *name)
{
size_t idx;
return (var_set_lookup_var_idx (vs, name, &idx)
{
assert (vs != NULL);
assert (name != NULL);
- assert (strlen (name) <= LONG_NAME_LEN);
+ assert (strlen (name) <= VAR_NAME_LEN);
return vs->lookup_var_idx (vs, name, idx);
}
/* Destroys VS. */
void
-var_set_destroy (struct var_set *vs)
+var_set_destroy (struct var_set *vs)
{
if (vs != NULL)
vs->destroy (vs);
\f
/* Returns the number of variables in VS. */
static size_t
-dict_var_set_get_cnt (const struct var_set *vs)
+dict_var_set_get_cnt (const struct var_set *vs)
{
struct dictionary *d = vs->aux;
/* Return variable with index IDX in VS.
IDX must be less than the number of variables in VS. */
static struct variable *
-dict_var_set_get_var (const struct var_set *vs, size_t idx)
+dict_var_set_get_var (const struct var_set *vs, size_t idx)
{
struct dictionary *d = vs->aux;
and returns true. Otherwise, returns false. */
static bool
dict_var_set_lookup_var_idx (const struct var_set *vs, const char *name,
- size_t *idx)
+ size_t *idx)
{
struct dictionary *d = vs->aux;
struct variable *v = dict_lookup_var (d, name);
- if (v != NULL)
+ if (v != NULL)
{
*idx = var_get_dict_index (v);
return true;
/* Destroys VS. */
static void
-dict_var_set_destroy (struct var_set *vs)
+dict_var_set_destroy (struct var_set *vs)
{
free (vs);
}
/* Returns a variable set based on D. */
struct var_set *
-var_set_create_from_dict (const struct dictionary *d)
+var_set_create_from_dict (const struct dictionary *d)
{
struct var_set *vs = xmalloc (sizeof *vs);
vs->get_cnt = dict_var_set_get_cnt;
}
\f
/* A variable set based on an array. */
-struct array_var_set
+struct array_var_set
{
struct variable *const *var;/* Array of variables. */
size_t var_cnt; /* Number of elements in var. */
- struct hsh_table *name_tab; /* Hash from variable names to variables. */
+ struct hmapx vars_by_name; /* Variables hashed by name. */
};
/* Returns the number of variables in VS. */
static size_t
-array_var_set_get_cnt (const struct var_set *vs)
+array_var_set_get_cnt (const struct var_set *vs)
{
struct array_var_set *avs = vs->aux;
/* Return variable with index IDX in VS.
IDX must be less than the number of variables in VS. */
static struct variable *
-array_var_set_get_var (const struct var_set *vs, size_t idx)
+array_var_set_get_var (const struct var_set *vs, size_t idx)
{
struct array_var_set *avs = vs->aux;
- return (struct variable *) avs->var[idx];
+ return CONST_CAST (struct variable *, avs->var[idx]);
}
/* If VS contains a variable named NAME, sets *IDX to its index
and returns true. Otherwise, returns false. */
static bool
array_var_set_lookup_var_idx (const struct var_set *vs, const char *name,
- size_t *idx)
+ size_t *idx)
{
struct array_var_set *avs = vs->aux;
- struct variable *v, *const *vpp;
+ struct hmapx_node *node;
+ struct variable **varp;
- v = var_create (name, 0);
- vpp = hsh_find (avs->name_tab, &v);
- var_destroy (v);
-
- if (vpp != NULL)
- {
- *idx = vpp - avs->var;
- return true;
- }
- else
- return false;
+ HMAPX_FOR_EACH_WITH_HASH (varp, node, hash_case_string (name, 0),
+ &avs->vars_by_name)
+ if (!strcasecmp (name, var_get_name (*varp)))
+ {
+ *idx = varp - avs->var;
+ return true;
+ }
+
+ return false;
}
/* Destroys VS. */
static void
-array_var_set_destroy (struct var_set *vs)
+array_var_set_destroy (struct var_set *vs)
{
struct array_var_set *avs = vs->aux;
- hsh_destroy (avs->name_tab);
+ hmapx_destroy (&avs->vars_by_name);
free (avs);
free (vs);
}
-/* Returns a variable set based on the VAR_CNT variables in
- VAR. */
+/* Returns a variable set based on the VAR_CNT variables in VAR. */
struct var_set *
-var_set_create_from_array (struct variable *const *var, size_t var_cnt)
+var_set_create_from_array (struct variable *const *var, size_t var_cnt)
{
struct var_set *vs;
struct array_var_set *avs;
vs->aux = avs = xmalloc (sizeof *avs);
avs->var = var;
avs->var_cnt = var_cnt;
- avs->name_tab = hsh_create (2 * var_cnt,
- compare_var_ptrs_by_name, hash_var_ptr_by_name,
- NULL, NULL);
+ hmapx_init (&avs->vars_by_name);
for (i = 0; i < var_cnt; i++)
- if (hsh_insert (avs->name_tab, (void *) &var[i]) != NULL)
- {
- var_set_destroy (vs);
- return NULL;
- }
-
+ {
+ const char *name = var_get_name (var[i]);
+ size_t idx;
+
+ if (array_var_set_lookup_var_idx (vs, name, &idx))
+ {
+ var_set_destroy (vs);
+ return NULL;
+ }
+ hmapx_insert (&avs->vars_by_name, CONST_CAST (void *, &avs->var[i]),
+ hash_case_string (name, 0));
+ }
+
return vs;
}
+
projects / pspp / blobdiff