X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fnumeric.c;h=b7ad96eb7440d9eb7cb5dc244c3aa00eee4bb9dd;hb=3816248a008a4af75aac6319d0c9929cb7ff679e;hp=826f0ebfaad1db44f0ae1a206b5394b88df5edbd;hpb=83141cdd4ab281da80d5dfeda05073f0cb354eab;p=pspp

diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c
index 826f0ebfaa..b7ad96eb74 100644
--- a/src/language/dictionary/numeric.c
+++ b/src/language/dictionary/numeric.c
@@ -1,5 +1,5 @@
 /* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
    Written by Ben Pfaff <blp@gnu.org>.
 
    This program is free software; you can redistribute it and/or
@@ -18,21 +18,26 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include <libpspp/message.h>
+
 #include <stdlib.h>
-#include <language/command.h>
+
 #include <data/dictionary.h>
-#include <libpspp/message.h>
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/lexer/format-parser.h>
 #include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
+#include <libpspp/assertion.h>
+#include <libpspp/message.h>
 #include <libpspp/str.h>
-#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
 /* Parses the NUMERIC command. */
 int
-cmd_numeric (void)
+cmd_numeric (struct lexer *lexer, struct dataset *ds)
 {
   size_t i;
 
@@ -46,22 +51,23 @@ cmd_numeric (void)
 
   do
     {
-      if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE))
+      if (!parse_DATA_LIST_vars (lexer, &v, &nv, PV_NONE))
 	return CMD_FAILURE;
 
       /* Get the optional format specification. */
-      if (lex_match ('('))
+      if (lex_match (lexer, '('))
 	{
-	  if (!parse_format_specifier (&f, 0))
+	  if (!parse_format_specifier (lexer, &f))
 	    goto fail;
-	  if (formats[f.type].cat & FCAT_STRING)
+	  if (fmt_is_string (f.type))
 	    {
+              char str[FMT_STRING_LEN_MAX + 1];
 	      msg (SE, _("Format type %s may not be used with a numeric "
-		   "variable."), fmt_to_string (&f));
+                         "variable."), fmt_to_string (&f, str));
 	      goto fail;
 	    }
 
-	  if (!lex_match (')'))
+	  if (!lex_match (lexer, ')'))
 	    {
 	      msg (SE, _("`)' expected after output format."));
 	      goto fail;
@@ -73,7 +79,7 @@ cmd_numeric (void)
       /* Create each variable. */
       for (i = 0; i < nv; i++)
 	{
-	  struct variable *new_var = dict_create_var (default_dict, v[i], 0);
+	  struct variable *new_var = dict_create_var (dataset_dict (ds), v[i], 0);
 	  if (!new_var)
 	    msg (SE, _("There is already a variable named %s."), v[i]);
 	  else
@@ -88,9 +94,9 @@ cmd_numeric (void)
 	free (v[i]);
       free (v);
     }
-  while (lex_match ('/'));
+  while (lex_match (lexer, '/'));
 
-  return lex_end_of_command ();
+  return lex_end_of_command (lexer);
 
   /* If we have an error at a point where cleanup is required,
      flow-of-control comes here. */
@@ -103,7 +109,7 @@ fail:
 
 /* Parses the STRING command. */
 int
-cmd_string (void)
+cmd_string (struct lexer *lexer, struct dataset *ds)
 {
   size_t i;
 
@@ -119,42 +125,29 @@ cmd_string (void)
 
   do
     {
-      if (!parse_DATA_LIST_vars (&v, &nv, PV_NONE))
+      if (!parse_DATA_LIST_vars (lexer, &v, &nv, PV_NONE))
 	return CMD_FAILURE;
 
-      if (!lex_force_match ('(')
-	  || !parse_format_specifier (&f, 0))
+      if (!lex_force_match (lexer, '(')
+          || !parse_format_specifier (lexer, &f)
+          || !lex_force_match (lexer, ')'))
 	goto fail;
-      if (!(formats[f.type].cat & FCAT_STRING))
+      if (!fmt_is_string (f.type))
 	{
+          char str[FMT_STRING_LEN_MAX + 1];
 	  msg (SE, _("Format type %s may not be used with a string "
-	       "variable."), fmt_to_string (&f));
+                     "variable."), fmt_to_string (&f, str));
 	  goto fail;
 	}
+      if (!fmt_check_output (&f))
+        goto fail;
 
-      if (!lex_match (')'))
-	{
-	  msg (SE, _("`)' expected after output format."));
-	  goto fail;
-	}
-
-      switch (f.type)
-	{
-	case FMT_A:
-	  width = f.w;
-	  break;
-	case FMT_AHEX:
-	  width = f.w / 2;
-	  break;
-	default:
-	  assert (0);
-          abort ();
-	}
+      width = fmt_var_width (&f);
 
       /* Create each variable. */
       for (i = 0; i < nv; i++)
 	{
-	  struct variable *new_var = dict_create_var (default_dict, v[i],
+	  struct variable *new_var = dict_create_var (dataset_dict (ds), v[i],
                                                       width);
 	  if (!new_var)
 	    msg (SE, _("There is already a variable named %s."), v[i]);
@@ -167,9 +160,9 @@ cmd_string (void)
 	free (v[i]);
       free (v);
     }
-  while (lex_match ('/'));
+  while (lex_match (lexer, '/'));
 
-  return lex_end_of_command ();
+  return lex_end_of_command (lexer);
 
   /* If we have an error at a point where cleanup is required,
      flow-of-control comes here. */
@@ -182,22 +175,18 @@ fail:
 
 /* Parses the LEAVE command. */
 int
-cmd_leave (void)
+cmd_leave (struct lexer *lexer, struct dataset *ds)
 {
   struct variable **v;
   size_t nv;
 
   size_t i;
 
-  if (!parse_variables (default_dict, &v, &nv, PV_NONE))
+  if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
     return CMD_CASCADING_FAILURE;
   for (i = 0; i < nv; i++)
-    {
-      if (!v[i]->reinit)
-	continue;
-      v[i]->reinit = 0;
-    }
+    v[i]->leave = true;
   free (v);
 
-  return lex_end_of_command ();
+  return lex_end_of_command (lexer);
 }