Improve the way we handle the various parsing "states". Until now

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

diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c
index 9e62d9930b9d7b3c21efa82cc5c920b3e80c9569..c325b4082e40a897980d123217e0fcf4323aa3a9 100644 (file)
--- a/src/language/dictionary/formats.c
+++ b/src/language/dictionary/formats.c
@@ -21,18 +21,16 @@
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "misc.h"
-#include "str.h"
-#include "variable.h"
+#include <language/command.h>
+#include <libpspp/message.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <libpspp/str.h>
+#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include "debug-print.h"
-
 enum
   {
     FORMATS_PRINT = 001,
@@ -81,7 +79,7 @@ internal_cmd_formats (int which)
        break;
 
       if (!parse_variables (default_dict, &v, &cv, PV_NUMERIC))
-       return CMD_PART_SUCCESS_MAYBE;
+       return CMD_FAILURE;
       type = v[0]->type;
 
       if (!lex_match ('('))
@@ -114,5 +112,5 @@ internal_cmd_formats (int which)
 
 fail:
   free (v);
-  return CMD_PART_SUCCESS_MAYBE;
+  return CMD_FAILURE;
 }