start updating expression tests

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

diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c
index 1ad2be802e437eadd50a481f0ae0499c5d5b6a83..10d239841e2a5371f7c5d36dda4c42f0639014dd 100644 (file)
--- a/src/language/expressions/evaluate.c
+++ b/src/language/expressions/evaluate.c
@@ -16,6 +16,7 @@
 
 #include <config.h>
 
+#include "language/expressions/private.h"
 #include "evaluate.h"
 
 #include <ctype.h>
@@ -23,7 +24,6 @@
 #include "libpspp/assertion.h"
 #include "libpspp/message.h"
 #include "language/expressions/helpers.h"
-#include "language/expressions/private.h"
 #include "language/lexer/value-parser.h"
 #include "libpspp/pool.h"
 #include "output/driver.h"
@@ -120,6 +120,7 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
   struct dataset *ds = NULL;
 
   char *name = NULL;
+  char *title = NULL;
 
   struct expression *expr;
 
@@ -184,14 +185,21 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
     }
 
   if (!lex_force_match (lexer, T_SLASH))
-      goto done;
+    goto done;
+
+  for (size_t i = 1; ; i++)
+    if (lex_next_token (lexer, i) == T_ENDCMD)
+      {
+        title = lex_next_representation (lexer, 0, i - 1);
+        break;
+      }
 
   expr = expr_parse_any (lexer, ds, optimize);
   if (!expr || lex_end_of_command (lexer) != CMD_SUCCESS)
     {
       if (expr != NULL)
         expr_free (expr);
-      output_log ("error");
+      output_log ("%s => error", title);
       goto done;
     }
 
@@ -204,16 +212,16 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
         {
           double d = expr_evaluate_num (expr, c, 0);
           if (d == SYSMIS)
-            output_log ("sysmis");
+            output_log ("%s => sysmis", title);
           else
-            output_log ("%.2f", d);
+            output_log ("%s => %.2f", title, d);
         }
         break;
 
       case OP_boolean:
         {
           double b = expr_evaluate_num (expr, c, 0);
-          output_log ("%s",
+          output_log ("%s => %s", title,
                       b == SYSMIS ? "sysmis" : b == 0.0 ? "false" : "true");
         }
         break;
@@ -222,7 +230,7 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
         {
           struct substring out;
           expr_evaluate (expr, c, 0, &out);
-          output_log ("\"%.*s\"", (int) out.length, out.string);
+          output_log ("%s => \"%.*s\"", title, (int) out.length, out.string);
           break;
         }
 
@@ -239,6 +247,7 @@ cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)
   case_unref (c);
 
   free (name);
+  free (title);
 
   return retval;
 }
@@ -294,6 +303,9 @@ expr_debug_print_postfix (const struct expression *e)
         case OP_integer:
           ds_put_format (&s, "i<%d>", op->integer);
           break;
+        case OP_exprnode:
+          ds_put_cstr (&s, "expr_node");
+          break;
         default:
           NOT_REACHED ();
         }