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->test = expr_parse (PXP_BOOLEAN);
+  compute->test = expr_parse (EXPR_BOOLEAN);
   if (compute->test == NULL)
     goto fail;
 
@@ -276,7 +276,7 @@ parse_rvalue_expression (struct compute_trns *compute,
 
   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;
 
@@ -357,7 +357,7 @@ lvalue_parse (void)
       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 (')'))