Move var_set and variable parsing declarations into new header.

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

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index e5e3e69fffea5482016c1aa8c1cf90b151d07b0c..4d13514e93fc1ece9c6d32ad9a2ee0482ba45aaf 100644 (file)
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -18,14 +18,18 @@
    02110-1301, USA. */
 
 #include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
+
+#include <data/procedure.h>
+#include <data/variable.h>
 #include <language/command.h>
-#include <libpspp/message.h>
 #include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
 #include <libpspp/str.h>
-#include <data/variable.h>
 
 /* Set variables' alignment
    This is the alignment for GUI display only.
@@ -42,9 +46,8 @@ cmd_variable_alignment (void)
       size_t i;
       enum alignment align;
 
-
       if (!parse_variables (default_dict, &v, &nv, PV_NONE))
-        return CMD_PART_SUCCESS_MAYBE;
+        return CMD_FAILURE;
 
       if ( lex_force_match('(') ) 
        {
@@ -95,7 +98,7 @@ cmd_variable_width (void)
       size_t i;
 
       if (!parse_variables (default_dict, &v, &nv, PV_NONE))
-        return CMD_PART_SUCCESS_MAYBE;
+        return CMD_FAILURE;
 
       if ( lex_force_match('(') ) 
        {
@@ -130,7 +133,7 @@ cmd_variable_level (void)
       size_t i;
 
       if (!parse_variables (default_dict, &v, &nv, PV_NONE))
-        return CMD_PART_SUCCESS_MAYBE;
+        return CMD_FAILURE;
 
       if ( lex_force_match('(') ) 
        {