Make the expression code a little nicer and fix bugs found

[pspp] / src / mis-val.c

diff --git a/src/mis-val.c b/src/mis-val.c
index a11833d71cb429d50fa0d444c5484de776b15d1a..66ceb9ce0886c1d92103de8d860cabecaf4aace3 100644 (file)
--- a/src/mis-val.c
+++ b/src/mis-val.c
@@ -18,7 +18,7 @@
    02111-1307, USA. */
 
 #include <config.h>
-#include <assert.h>
+#include "error.h"
 #include <stdlib.h>
 #include "command.h"
 #include "error.h"
@@ -27,8 +27,6 @@
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 #if DEBUGGING
@@ -58,8 +56,6 @@ cmd_missing_values (void)
 {
   int i;
 
-  lex_match_id ("MISSING");
-  lex_match_id ("VALUES");
   while (token != '.')
     {
       if (!parse_varnames ())
@@ -90,7 +86,7 @@ cmd_missing_values (void)
       free (v);
     }
 
-#if DEBUGGING
+#if 0 && DEBUGGING
   debug_print ();
 #endif
 
@@ -106,7 +102,7 @@ parse_varnames (void)
 {
   int i;
 
-  if (!parse_variables (NULL, &v, &nv, PV_SAME_TYPE))
+  if (!parse_variables (default_dict, &v, &nv, PV_SAME_TYPE))
     return 0;
   if (!lex_match ('('))
     {
@@ -359,7 +355,7 @@ copy_missing_values (struct variable *dest, const struct variable *src)
 \f
 /* Debug output. */
 
-#if DEBUGGING
+#if 0 && DEBUGGING
 static void
 debug_print (void)
 {