Completely rewrite src/data/format.[ch], to achieve better

[pspp-builds.git] / src / language / dictionary / missing-values.c

diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c
index 352284b3af1a49957cbe492cb0baf133e8a8c355..a330c46e75ace37a8cb9d593a361f7fef771613d 100644 (file)
--- a/src/language/dictionary/missing-values.c
+++ b/src/language/dictionary/missing-values.c
@@ -1,5 +1,5 @@
 /* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
    Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
@@ -18,36 +18,38 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include "message.h"
+
 #include <stdlib.h>
-#include "command.h"
-#include "data-in.h"
-#include "message.h"
-#include "lexer.h"
-#include "magic.h"
-#include "range-parser.h"
-#include "str.h"
-#include "variable.h"
+
+#include <data/data-in.h>
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
+#include <language/lexer/range-parser.h>
+#include <libpspp/magic.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
+#include <libpspp/str.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
-
 int
-cmd_missing_values (void)
+cmd_missing_values (struct dataset *ds)
 {
   struct variable **v;
   size_t nv;
 
-  int retval = CMD_PART_SUCCESS_MAYBE;
+  int retval = CMD_FAILURE;
   bool deferred_errors = false;
 
   while (token != '.')
     {
       size_t i;
 
-      if (!parse_variables (default_dict, &v, &nv, PV_NONE)) 
+      if (!parse_variables (dataset_dict (ds), &v, &nv, PV_NONE)) 
         goto done;
 
       if (!lex_match ('('))
@@ -149,7 +151,7 @@ cmd_missing_values (void)
  done:
   free (v);
   if (deferred_errors)
-    retval = CMD_PART_SUCCESS_MAYBE;
+    retval = CMD_FAILURE;
   return retval;
 }