X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fnumeric.c;h=b97410a51bc234ffb826e06d6705f339ea56e6eb;hb=c87013b64d1731dac5da8f738ae8d1b4c1030a90;hp=f80865d1dadce9aa1ec4cf63249729a93f06d114;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp-builds.git

diff --git a/src/numeric.c b/src/numeric.c
index f80865d1..b97410a5 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -20,15 +20,12 @@
 #include <config.h>
 #include <assert.h>
 #include <stdlib.h>
-#include "cases.h"
 #include "command.h"
 #include "error.h"
 #include "lexer.h"
 #include "str.h"
 #include "var.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #include "debug-print.h"
 
 /* Parses the NUMERIC command. */
@@ -75,15 +72,13 @@ cmd_numeric (void)
       /* Create each variable. */
       for (i = 0; i < nv; i++)
 	{
-	  struct variable *new_var = create_variable (&default_dict, v[i],
-					       NUMERIC, 0);
+	  struct variable *new_var = dict_create_var (default_dict, v[i], 0);
 	  if (!new_var)
 	    msg (SE, _("There is already a variable named %s."), v[i]);
 	  else
 	    {
 	      if (f.type != -1)
 		new_var->print = new_var->write = f;
-	      envector (new_var);
 	    }
 	}
 
@@ -158,15 +153,12 @@ cmd_string (void)
       /* Create each variable. */
       for (i = 0; i < nv; i++)
 	{
-	  struct variable *new_var = create_variable (&default_dict, v[i],
-					       ALPHA, width);
+	  struct variable *new_var = dict_create_var (default_dict, v[i],
+                                                      width);
 	  if (!new_var)
 	    msg (SE, _("There is already a variable named %s."), v[i]);
 	  else
-	    {
-	      new_var->print = new_var->write = f;
-	      envector (new_var);
-	    }
+            new_var->print = new_var->write = f;
 	}
 
       /* Clean up. */
@@ -197,15 +189,14 @@ cmd_leave (void)
   int i;
 
   lex_match_id ("LEAVE");
-  if (!parse_variables (NULL, &v, &nv, PV_NONE))
+  if (!parse_variables (default_dict, &v, &nv, PV_NONE))
     return CMD_FAILURE;
   for (i = 0; i < nv; i++)
     {
-      if (v[i]->left)
+      if (!v[i]->reinit)
 	continue;
-      devector (v[i]);
-      v[i]->left = 1;
-      envector (v[i]);
+      v[i]->reinit = 0;
+      v[i]->init = 1;
     }
   free (v);