X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fcorrelations.q;h=c7aed0ddc4b16575256125669cf1392eb2a0411d;hb=8b811199c8a79dba237254527012b43773e60975;hp=6b708f6497fcb3863ff3d42c6fa5fcee7aa11031;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp

diff --git a/src/correlations.q b/src/correlations.q
index 6b708f6497..c7aed0ddc4 100644
--- a/src/correlations.q
+++ b/src/correlations.q
@@ -26,8 +26,6 @@
 #include "var.h"
 /* (headers) */
 
-#undef DEBUGGING
-#define DEBUGGING 1
 #include "debug-print.h"
 
 struct cor_set
@@ -92,18 +90,19 @@ cor_custom_variables (struct cmd_correlations *cmd unused)
   struct cor_set *cor;
 
   /* Ensure that this is a VARIABLES subcommand. */
-  if (!lex_match_id ("VARIABLES") && (token != T_ID || !is_varname (tokid))
+  if (!lex_match_id ("VARIABLES")
+      && (token != T_ID || dict_lookup_var (default_dict, tokid) != NULL)
       && token != T_ALL)
     return 2;
   lex_match ('=');
 
-  if (!parse_variables (&default_dict, &v1, &nv1,
+  if (!parse_variables (default_dict, &v1, &nv1,
 			PV_NO_DUPLICATE | PV_NUMERIC))
     return 0;
   
   if (lex_match (T_WITH))
     {
-      if (!parse_variables (&default_dict, &v2, &nv2,
+      if (!parse_variables (default_dict, &v2, &nv2,
 			    PV_NO_DUPLICATE | PV_NUMERIC))
 	{
 	  free (v1);
@@ -164,3 +163,9 @@ free_correlations_state (void)
       free (cor);
     }
 }
+
+/*
+  Local Variables:
+  mode: c
+  End:
+*/