X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fdictionary%2Fvariable-display.c;h=fa6eae467f152ac944e691c4a0e29f43776c8ce7;hb=fd0958dc7caa5806b82b9757e2b937c5b7def369;hp=c1b6e1e7b847a29f447cac84ab50864666649d37;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index c1b6e1e7b8..fa6eae467f 100644
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -18,23 +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>
-
-#include <libpspp/debug-print.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
     {
@@ -44,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('(') ) 
 	{
@@ -88,7 +89,7 @@ cmd_variable_alignment (void)
    It affects nothing but GUIs
 */
 int
-cmd_variable_width (void)
+cmd_variable_width (struct dataset *ds)
 {
   do
     {
@@ -96,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('(') ) 
 	{
@@ -122,7 +123,7 @@ cmd_variable_width (void)
 
 /* Set variables' measurement level */
 int
-cmd_variable_level (void)
+cmd_variable_level (struct dataset *ds)
 {
   do
     {
@@ -131,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('(') ) 
 	{