Rewrite and improve formatted output routines.

[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..fa6eae467f152ac944e691c4a0e29f43776c8ce7 100644 (file)
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -18,21 +18,25 @@
    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.
    It affects nothing but GUIs
 */
 int
-cmd_variable_alignment (void)
+cmd_variable_alignment (struct dataset *ds)
 {
   do
     {
@@ -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;
+      if (!parse_variables (dataset_dict (ds), &v, &nv, PV_NONE))
+        return CMD_FAILURE;
 
       if ( lex_force_match('(') ) 
        {
@@ -86,7 +89,7 @@ cmd_variable_alignment (void)
    It affects nothing but GUIs
 */
 int
-cmd_variable_width (void)
+cmd_variable_width (struct dataset *ds)
 {
   do
     {
@@ -94,8 +97,8 @@ cmd_variable_width (void)
       size_t nv;
       size_t i;
 
-      if (!parse_variables (default_dict, &v, &nv, PV_NONE))
-        return CMD_PART_SUCCESS_MAYBE;
+      if (!parse_variables (dataset_dict (ds), &v, &nv, PV_NONE))
+        return CMD_FAILURE;
 
       if ( lex_force_match('(') ) 
        {
@@ -120,7 +123,7 @@ cmd_variable_width (void)
 
 /* Set variables' measurement level */
 int
-cmd_variable_level (void)
+cmd_variable_level (struct dataset *ds)
 {
   do
     {
@@ -129,8 +132,8 @@ cmd_variable_level (void)
       enum measure level;
       size_t i;
 
-      if (!parse_variables (default_dict, &v, &nv, PV_NONE))
-        return CMD_PART_SUCCESS_MAYBE;
+      if (!parse_variables (dataset_dict (ds), &v, &nv, PV_NONE))
+        return CMD_FAILURE;
 
       if ( lex_force_match('(') ) 
        {