projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sat Dec 27 16:16:49 2003 Ben Pfaff <blp@gnu.org>
[pspp-builds.git]
/
src
/
expr-prs.c
diff --git
a/src/expr-prs.c
b/src/expr-prs.c
index 3d5973950695d22aa553442ee4396988b09d9f7f..046e360f1dfe610a6035a7b5e08ad31295f0affa 100644
(file)
--- a/
src/expr-prs.c
+++ b/
src/expr-prs.c
@@
-18,6
+18,8
@@
02111-1307, USA. */
#include <config.h>
02111-1307, USA. */
#include <config.h>
+#include "expr.h"
+#include "exprP.h"
#include <assert.h>
#include <ctype.h>
#include <float.h>
#include <assert.h>
#include <ctype.h>
#include <float.h>
@@
-25,13
+27,10
@@
#include "algorithm.h"
#include "alloc.h"
#include "error.h"
#include "algorithm.h"
#include "alloc.h"
#include "error.h"
-#include "expr.h"
-#include "exprP.h"
#include "lexer.h"
#include "misc.h"
#include "str.h"
#include "var.h"
#include "lexer.h"
#include "misc.h"
#include "str.h"
#include "var.h"
-#include "vector.h"
#include "vfm.h"
\f
/* Declarations. */
#include "vfm.h"
\f
/* Declarations. */
@@
-624,7
+623,7
@@
parse_primary (union any_node **n)
}
/* Otherwise, it must be a user variable. */
}
/* Otherwise, it must be a user variable. */
- v =
find_variable (
tokid);
+ v =
dict_lookup_var (default_dict,
tokid);
lex_get ();
if (v == NULL)
{
lex_get ();
if (v == NULL)
{
@@
-757,7
+756,9
@@
ternary_func (struct function * f, int x unused, union any_node ** n)
static int
MISSING_func (struct function * f, int x unused, union any_node ** n)
{
static int
MISSING_func (struct function * f, int x unused, union any_node ** n)
{
- if (token == T_ID && is_varname (tokid) && lex_look_ahead () == ')')
+ if (token == T_ID
+ && dict_lookup_var (default_dict, tokid) != NULL
+ && lex_look_ahead () == ')')
{
struct var_node *c = xmalloc (sizeof *c);
c->v = parse_variable ();
{
struct var_node *c = xmalloc (sizeof *c);
c->v = parse_variable ();
@@
-775,7
+776,9
@@
SYSMIS_func (struct function * f unused, int x unused, union any_node ** n)
{
int t;
{
int t;
- if (token == T_ID && is_varname (tokid) && lex_look_ahead () == ')')
+ if (token == T_ID
+ && dict_lookup_var (default_dict, tokid)
+ && lex_look_ahead () == ')')
{
struct variable *v;
v = parse_variable ();
{
struct variable *v;
v = parse_variable ();
@@
-894,7
+897,7
@@
nary_num_func (struct function *f, int min_args, union any_node **n)
/* FIXME: Is this condition failsafe? Can we _ever_ have two
juxtaposed identifiers otherwise? */
/* FIXME: Is this condition failsafe? Can we _ever_ have two
juxtaposed identifiers otherwise? */
- if (token == T_ID &&
is_varname (tokid)
+ if (token == T_ID &&
dict_lookup_var (default_dict, tokid) != NULL
&& toupper (lex_look_ahead ()) == 'T')
{
struct variable **v;
&& toupper (lex_look_ahead ()) == 'T')
{
struct variable **v;
@@
-906,7
+909,7
@@
nary_num_func (struct function *f, int min_args, union any_node **n)
opts |= PV_NUMERIC;
else if (type == ALPHA)
opts |= PV_STRING;
opts |= PV_NUMERIC;
else if (type == ALPHA)
opts |= PV_STRING;
- if (!parse_variables (
NULL
, &v, &nv, opts))
+ if (!parse_variables (
default_dict
, &v, &nv, opts))
goto fail;
if (nv + (*n)->nonterm.n >= m)
{
goto fail;
if (nv + (*n)->nonterm.n >= m)
{
@@
-1221,10
+1224,10
@@
parse_function (union any_node ** n)
char fname[32], *cp;
int t;
int min_args;
char fname[32], *cp;
int t;
int min_args;
- struct vector *v;
+
const
struct vector *v;
/* Check for a vector with this name. */
/* Check for a vector with this name. */
- v =
find_vector (
tokid);
+ v =
dict_lookup_vector (default_dict,
tokid);
if (v)
{
lex_get ();
if (v)
{
lex_get ();
@@
-1233,7
+1236,7
@@
parse_function (union any_node ** n)
*n = xmalloc (sizeof (struct nonterm_node)
+ sizeof (union any_node *[2]));
*n = xmalloc (sizeof (struct nonterm_node)
+ sizeof (union any_node *[2]));
- (*n)->nonterm.type = (v->v[0]->type == NUMERIC
+ (*n)->nonterm.type = (v->v
ar
[0]->type == NUMERIC
? OP_VEC_ELEM_NUM : OP_VEC_ELEM_STR);
(*n)->nonterm.n = 0;
? OP_VEC_ELEM_NUM : OP_VEC_ELEM_STR);
(*n)->nonterm.n = 0;
@@
-1252,9
+1255,9
@@
parse_function (union any_node ** n)
msg (SE, _("`)' expected after a vector index value."));
goto fail;
}
msg (SE, _("`)' expected after a vector index value."));
goto fail;
}
- ((*n)->nonterm.arg[1]) = (union any_node *) v->i
nde
x;
+ ((*n)->nonterm.arg[1]) = (union any_node *) v->i
d
x;
- return v->v[0]->type == NUMERIC ? EX_NUMERIC : EX_STRING;
+ return v->v
ar
[0]->type == NUMERIC ? EX_NUMERIC : EX_STRING;
}
ds_truncate (&tokstr, 31);
}
ds_truncate (&tokstr, 31);