X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fnumeric.c;h=ee8ec552ef60ebd29213ee8fd526802222c6f637;hb=3bd4593ef9a57f23062c61ec465389f749ba3089;hp=065b1a30294488df4d1b912c68c3398d75938914;hpb=fcb9e49b2a2d57af7c001ae5d2eda9ac443ba36b;p=pspp-builds.git

diff --git a/src/numeric.c b/src/numeric.c
index 065b1a30..ee8ec552 100644
--- a/src/numeric.c
+++ b/src/numeric.c
@@ -18,10 +18,10 @@
    02111-1307, USA. */
 
 #include <config.h>
-#include <assert.h>
+#include "error.h"
 #include <stdlib.h>
-#include "cases.h"
 #include "command.h"
+#include "dictionary.h"
 #include "error.h"
 #include "lexer.h"
 #include "str.h"
@@ -43,7 +43,6 @@ cmd_numeric (void)
      be used. */
   struct fmt_spec f;
 
-  lex_match_id ("NUMERIC");
   do
     {
       if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE))
@@ -73,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);
 	    }
 	}
 
@@ -119,7 +116,6 @@ cmd_string (void)
   /* Width of variables to create. */
   int width;
 
-  lex_match_id ("STRING");
   do
     {
       if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE))
@@ -151,20 +147,18 @@ cmd_string (void)
 	  break;
 	default:
 	  assert (0);
+          abort ();
 	}
 
       /* 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. */
@@ -194,16 +188,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);