better tests

[pspp] / src / language / expressions / optimize.c

diff --git a/src/language/expressions/optimize.c b/src/language/expressions/optimize.c
index 30c3a89a1031b87d6b28e9ba55e1040bdc347c48..7d683d0181f55d5dcff4355eaadc0d4548d76c5f 100644 (file)
--- a/src/language/expressions/optimize.c
+++ b/src/language/expressions/optimize.c
@@ -67,26 +67,34 @@ expr_optimize (struct expr_node *node, struct expression *e)
     }
 
   op = &operations[node->type];
+
+  struct expr_node *new;
   if (n_sysmis && (op->flags & OPF_ABSORB_MISS) == 0)
     {
       /* Most operations produce SYSMIS given any SYSMIS
          argument. */
       assert (op->returns == OP_number || op->returns == OP_boolean);
-      if (op->returns == OP_number)
-        return expr_allocate_number (e, SYSMIS);
-      else
-        return expr_allocate_boolean (e, SYSMIS);
+      new = (op->returns == OP_number
+             ? expr_allocate_number (e, SYSMIS)
+             : expr_allocate_boolean (e, SYSMIS));
     }
   else if (!n_nonconst && (op->flags & OPF_NONOPTIMIZABLE) == 0)
     {
       /* Evaluate constant expressions. */
-      return evaluate_tree (node, e);
+      new = evaluate_tree (node, e);
     }
   else
     {
       /* A few optimization possibilities are still left. */
-      return optimize_tree (node, e);
+      new = optimize_tree (node, e);
     }
+
+  if (new != node && !new->location)
+    {
+      const struct msg_location *loc = expr_location (e, node);
+      new->location = CONST_CAST (struct msg_location *, loc);
+    }
+  return new;
 }
 
 static int
@@ -185,6 +193,14 @@ get_format_arg (struct expr_node *n, size_t arg_idx)
   return &n->args[arg_idx]->format;
 }
 
+static const struct expr_node *
+get_expr_node_arg (struct expr_node *n, size_t arg_idx)
+{
+  assert (arg_idx < n->n_args);
+  assert (n->args[arg_idx]->type == OP_expr_node);
+  return n->args[arg_idx]->expr_node;
+}
+
 static struct expr_node *
 evaluate_tree (struct expr_node *node, struct expression *e)
 {
@@ -279,6 +295,7 @@ flatten_atom (struct expr_node *n, struct expression *e)
     case OP_no_format:
     case OP_ni_format:
     case OP_pos_int:
+    case OP_expr_node:
       /* These are passed as aux data following the
          operation. */
       break;
@@ -323,6 +340,10 @@ flatten_composite (struct expr_node *n, struct expression *e)
           emit_integer (e, arg->integer);
           break;
 
+        case OP_expr_node:
+          allocate_aux (e, OP_expr_node)->expr_node = arg->expr_node;
+          break;
+
         default:
           /* Nothing to do. */
           break;
@@ -334,7 +355,7 @@ flatten_composite (struct expr_node *n, struct expression *e)
   if (op->flags & OPF_MIN_VALID)
     emit_integer (e, n->min_valid);
   if (op->flags & OPF_EXPR_NODE)
-    allocate_aux (e, OP_exprnode)->node = n;
+    allocate_aux (e, OP_expr_node)->expr_node = n;
 }
 
 void