projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Damn! Forgot to change casenum_t in *.q
[pspp]
/
src
/
language
/
lexer
/
variable-parser.c
diff --git
a/src/language/lexer/variable-parser.c
b/src/language/lexer/variable-parser.c
index 98b70ea2f7ac97001391135a9968ef2900164757..2de98829bbc06f828eabc12299469e098612a65a 100644
(file)
--- a/
src/language/lexer/variable-parser.c
+++ b/
src/language/lexer/variable-parser.c
@@
-79,7
+79,7
@@
parse_vs_variable (const struct var_set *vs)
variable if successful. On failure emits an error message and
returns a null pointer. */
struct variable *
variable if successful. On failure emits an error message and
returns a null pointer. */
struct variable *
-parse_
dict_
variable (const struct dictionary *d)
+parse_variable (const struct dictionary *d)
{
struct var_set *vs = var_set_create_from_dict (d);
struct variable *var = parse_vs_variable (vs);
{
struct var_set *vs = var_set_create_from_dict (d);
struct variable *var = parse_vs_variable (vs);
@@
-87,21
+87,11
@@
parse_dict_variable (const struct dictionary *d)
return var;
}
return var;
}
-/* Parses a variable name in default_dict and returns the
- variable if successful. On failure emits an error message and
- returns a null pointer. */
-struct variable *
-parse_variable (void)
-{
- return parse_dict_variable (default_dict);
-}
-
-
/* Parses a set of variables from dictionary D given options
OPTS. Resulting list of variables stored in *VAR and the
/* Parses a set of variables from dictionary D given options
OPTS. Resulting list of variables stored in *VAR and the
- number of variables into *CNT. Returns
nonzero
only if
+ number of variables into *CNT. Returns
true
only if
successful. */
successful. */
-int
+bool
parse_variables (const struct dictionary *d, struct variable ***var,
size_t *cnt, int opts)
{
parse_variables (const struct dictionary *d, struct variable ***var,
size_t *cnt, int opts)
{
@@
-122,10
+112,10
@@
parse_variables (const struct dictionary *d, struct variable ***var,
/* Parses a set of variables from dictionary D given options
OPTS. Resulting list of variables stored in *VARS and the
/* Parses a set of variables from dictionary D given options
OPTS. Resulting list of variables stored in *VARS and the
- number of variables into *VAR_CNT. Returns
nonzero
only if
+ number of variables into *VAR_CNT. Returns
true
only if
successful. Same behavior as parse_variables, except that all
allocations are taken from the given POOL. */
successful. Same behavior as parse_variables, except that all
allocations are taken from the given POOL. */
-int
+bool
parse_variables_pool (struct pool *pool, const struct dictionary *dict,
struct variable ***vars, size_t *var_cnt, int opts)
{
parse_variables_pool (struct pool *pool, const struct dictionary *dict,
struct variable ***vars, size_t *var_cnt, int opts)
{
@@
-145,17
+135,17
@@
parse_variables_pool (struct pool *pool, const struct dictionary *dict,
/* Parses a variable name from VS. If successful, sets *IDX to
the variable's index in VS, *CLASS to the variable's
/* Parses a variable name from VS. If successful, sets *IDX to
the variable's index in VS, *CLASS to the variable's
- dictionary class, and returns
nonzero. Returns zero
on
+ dictionary class, and returns
true. Returns false
on
failure. */
failure. */
-static
int
+static
bool
parse_var_idx_class (const struct var_set *vs, size_t *idx,
enum dict_class *class)
{
if (!parse_vs_variable_idx (vs, idx))
parse_var_idx_class (const struct var_set *vs, size_t *idx,
enum dict_class *class)
{
if (!parse_vs_variable_idx (vs, idx))
- return
0
;
+ return
false
;
*class = dict_class_from_id (var_set_get_var (vs, *idx)->name);
*class = dict_class_from_id (var_set_get_var (vs, *idx)->name);
- return
1
;
+ return
true
;
}
/* Add the variable from VS with index IDX to the list of
}
/* Add the variable from VS with index IDX to the list of
@@
-218,10
+208,10
@@
add_variables (struct variable ***v, size_t *nv, size_t *mv, char *included,
add_variable (v, nv, mv, included, pv_opts, vs, i);
}
add_variable (v, nv, mv, included, pv_opts, vs, i);
}
-/* Note that if parse_variables() returns
0
, *v is free()'d.
- Conversely, if parse_variables() returns
non-zero
, then *nv is
+/* Note that if parse_variables() returns
false
, *v is free()'d.
+ Conversely, if parse_variables() returns
true
, then *nv is
nonzero and *v is non-NULL. */
nonzero and *v is non-NULL. */
-int
+bool
parse_var_set_vars (const struct var_set *vs,
struct variable ***v, size_t *nv,
int pv_opts)
parse_var_set_vars (const struct var_set *vs,
struct variable ***v, size_t *nv,
int pv_opts)
@@
-381,7
+371,7
@@
extract_num (char *s, char *r, int *n, int *d)
/* Parses a list of variable names according to the DATA LIST version
of the TO convention. */
/* Parses a list of variable names according to the DATA LIST version
of the TO convention. */
-int
+bool
parse_DATA_LIST_vars (char ***names, size_t *nnames, int pv_opts)
{
int n1, n2;
parse_DATA_LIST_vars (char ***names, size_t *nnames, int pv_opts)
{
int n1, n2;
@@
-511,7
+501,7
@@
register_vars_pool (struct pool *pool, char **names, size_t nnames)
version of the TO convention. Same args as
parse_DATA_LIST_vars(), except that all allocations are taken
from the given POOL. */
version of the TO convention. Same args as
parse_DATA_LIST_vars(), except that all allocations are taken
from the given POOL. */
-int
+bool
parse_DATA_LIST_vars_pool (struct pool *pool,
char ***names, size_t *nnames, int pv_opts)
{
parse_DATA_LIST_vars_pool (struct pool *pool,
char ***names, size_t *nnames, int pv_opts)
{
@@
-532,8
+522,9
@@
parse_DATA_LIST_vars_pool (struct pool *pool,
/* Parses a list of variables where some of the variables may be
existing and the rest are to be created. Same args as
parse_DATA_LIST_vars(). */
/* Parses a list of variables where some of the variables may be
existing and the rest are to be created. Same args as
parse_DATA_LIST_vars(). */
-int
-parse_mixed_vars (char ***names, size_t *nnames, int pv_opts)
+bool
+parse_mixed_vars (const struct dictionary *dict,
+ char ***names, size_t *nnames, int pv_opts)
{
size_t i;
{
size_t i;
@@
-548,12
+539,12
@@
parse_mixed_vars (char ***names, size_t *nnames, int pv_opts)
}
while (token == T_ID || token == T_ALL)
{
}
while (token == T_ID || token == T_ALL)
{
- if (token == T_ALL || dict_lookup_var (d
efault_d
ict, tokid) != NULL)
+ if (token == T_ALL || dict_lookup_var (dict, tokid) != NULL)
{
struct variable **v;
size_t nv;
{
struct variable **v;
size_t nv;
- if (!parse_variables (d
efault_d
ict, &v, &nv, PV_NONE))
+ if (!parse_variables (dict, &v, &nv, PV_NONE))
goto fail;
*names = xnrealloc (*names, *nnames + nv, sizeof **names);
for (i = 0; i < nv; i++)
goto fail;
*names = xnrealloc (*names, *nnames + nv, sizeof **names);
for (i = 0; i < nv; i++)
@@
-579,8
+570,8
@@
fail:
existing and the rest are to be created. Same args as
parse_mixed_vars(), except that all allocations are taken
from the given POOL. */
existing and the rest are to be created. Same args as
parse_mixed_vars(), except that all allocations are taken
from the given POOL. */
-int
-parse_mixed_vars_pool (struct pool *pool,
+bool
+parse_mixed_vars_pool (
const struct dictionary *dict,
struct pool *pool,
char ***names, size_t *nnames, int pv_opts)
{
int retval;
char ***names, size_t *nnames, int pv_opts)
{
int retval;
@@
-591,7
+582,7
@@
parse_mixed_vars_pool (struct pool *pool,
re-free it later. */
assert (!(pv_opts & PV_APPEND));
re-free it later. */
assert (!(pv_opts & PV_APPEND));
- retval = parse_mixed_vars (names, nnames, pv_opts);
+ retval = parse_mixed_vars (
dict,
names, nnames, pv_opts);
if (retval)
register_vars_pool (pool, *names, *nnames);
return retval;
if (retval)
register_vars_pool (pool, *names, *nnames);
return retval;