Continue reforming procedure execution. In this phase, move

[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 b7dd8126c25a157a632ce71d363b96c12a32c6d5..2348b721157b2bc6868ba81ed8f9e667eafabb69 100644 (file)
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -18,16 +18,17 @@
    02110-1301, USA. */
 
 #include <config.h>
+
 #include <stdio.h>
 #include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
 
-#include "debug-print.h"
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
+#include <libpspp/str.h>
 
 /* Set variables' alignment
    This is the alignment for GUI display only.
@@ -44,9 +45,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('(') ) 
        {
@@ -97,7 +97,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('(') ) 
        {
@@ -132,7 +132,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('(') ) 
        {