projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the expression code a little nicer and fix bugs found
[pspp-builds.git]
/
src
/
compute.c
diff --git
a/src/compute.c
b/src/compute.c
index 7ef93858c2118bd2db8175ad9a7fc0fb7ce0b904..4cc9a18797b4c8b7eea55c8d57fad1f3ff83e103 100644
(file)
--- a/
src/compute.c
+++ b/
src/compute.c
@@
-233,7
+233,7
@@
cmd_if (void)
compute = compute_trns_create ();
/* Test expression. */
compute = compute_trns_create ();
/* Test expression. */
- compute->test = expr_parse (
PXP
_BOOLEAN);
+ compute->test = expr_parse (
EXPR
_BOOLEAN);
if (compute->test == NULL)
goto fail;
if (compute->test == NULL)
goto fail;
@@
-276,7
+276,7
@@
parse_rvalue_expression (struct compute_trns *compute,
assert (type == NUMERIC || type == ALPHA);
assert (type == NUMERIC || type == ALPHA);
- compute->rvalue = expr_parse (type == ALPHA ?
PXP_STRING : PXP
_NUMERIC);
+ compute->rvalue = expr_parse (type == ALPHA ?
EXPR_STRING : EXPR
_NUMERIC);
if (compute->rvalue == NULL)
return 0;
if (compute->rvalue == NULL)
return 0;
@@
-357,7
+357,7
@@
lvalue_parse (void)
lex_get ();
if (!lex_force_match ('('))
goto lossage;
lex_get ();
if (!lex_force_match ('('))
goto lossage;
- lvalue->element = expr_parse (
PXP
_NUMERIC);
+ lvalue->element = expr_parse (
EXPR
_NUMERIC);
if (lvalue->element == NULL)
goto lossage;
if (!lex_force_match (')'))
if (lvalue->element == NULL)
goto lossage;
if (!lex_force_match (')'))