start updating expression tests

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

diff --git a/src/language/expressions/optimize.c b/src/language/expressions/optimize.c
index ea631a975c4af3fd582523e74d235594f2399445..30c3a89a1031b87d6b28e9ba55e1040bdc347c48 100644 (file)
--- a/src/language/expressions/optimize.c
+++ b/src/language/expressions/optimize.c
@@ -135,38 +135,13 @@ optimize_tree (struct expr_node *n, struct expression *e)
     return n;
 }
 
-static double get_number_arg (struct expr_node *, size_t arg_idx);
-static double *get_number_args (struct expr_node *,
-                                 size_t arg_idx, size_t n_args,
-                                 struct expression *);
-static struct substring get_string_arg (struct expr_node *,
-                                           size_t arg_idx);
-static struct substring *get_string_args (struct expr_node *,
-                                             size_t arg_idx, size_t n_args,
-                                             struct expression *);
-static const struct fmt_spec *get_format_arg (struct expr_node *,
-                                              size_t arg_idx);
-
-static struct expr_node *
-evaluate_tree (struct expr_node *node, struct expression *e)
-{
-  switch (node->type)
-    {
-#include "optimize.inc"
-
-    default:
-      NOT_REACHED ();
-    }
-
-  NOT_REACHED ();
-}
-
 static double
 get_number_arg (struct expr_node *n, size_t arg_idx)
 {
   assert (arg_idx < n->n_args);
   assert (n->args[arg_idx]->type == OP_number
-          || n->args[arg_idx]->type == OP_boolean);
+          || n->args[arg_idx]->type == OP_boolean
+          || n->args[arg_idx]->type == OP_integer);
   return n->args[arg_idx]->number;
 }
 
@@ -209,6 +184,20 @@ get_format_arg (struct expr_node *n, size_t arg_idx)
           || n->args[arg_idx]->type == OP_no_format);
   return &n->args[arg_idx]->format;
 }
+
+static struct expr_node *
+evaluate_tree (struct expr_node *node, struct expression *e)
+{
+  switch (node->type)
+    {
+#include "optimize.inc"
+
+    default:
+      NOT_REACHED ();
+    }
+
+  NOT_REACHED ();
+}
 \f
 /* Expression flattening. */
 
@@ -344,6 +333,8 @@ flatten_composite (struct expr_node *n, struct expression *e)
     emit_integer (e, n->n_args - op->n_args + 1);
   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;
 }
 
 void