Make FILTER without any further keywords turn off filtering, with a

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

diff --git a/src/language/expressions/helpers.c b/src/language/expressions/helpers.c
index 9d0d18cab134185f5d5b4d308e21a7a5be12fef4..4dd3cf3de7c2d7cb29eaa2df9625e5b0ebaa4b9b 100644 (file)
--- a/src/language/expressions/helpers.c
+++ b/src/language/expressions/helpers.c
@@ -10,19 +10,19 @@ const struct fixed_string empty_string = {NULL, 0};
 static void
 expr_error (void *aux UNUSED, const char *format, ...) 
 {
-  struct error e;
+  struct msg m;
   va_list args;
 
   /* FIXME: we can do better about saying where the error
      occurred. */
-  e.category = MSG_SYNTAX;
-  e.severity = MSG_ERROR;
-  err_location (&e.where);
-  e.title = NULL;
-
+  m.category = MSG_SYNTAX;
+  m.severity = MSG_ERROR;
+  msg_location (&m.where);
   va_start (args, format);
-  err_vmsg (&e, format, args);
+  m.text = xvasprintf (format, args);
   va_end (args);
+
+  msg_emit (&m);
 }
 
 double