X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fformats.c;h=a90f46e8b8efe6f4e4ce9f7efa9ca2b27572f450;hb=0097b71cac1297fba88b3c019836090dd0cf639c;hp=4bc6e3f47767335bba767099bc38a76be1d85c8e;hpb=84e4d346b557748b62d43158c1b50f655e357f9f;p=pspp-builds.git

diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c
index 4bc6e3f4..a90f46e8 100644
--- a/src/language/dictionary/formats.c
+++ b/src/language/dictionary/formats.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
-   Written by Ben Pfaff <blp@gnu.org>.
+   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -42,28 +41,28 @@ enum
     FORMATS_WRITE = 002
   };
 
-static int internal_cmd_formats (int);
+static int internal_cmd_formats (struct lexer *, struct dataset *ds, int);
 
 int
-cmd_print_formats (void)
+cmd_print_formats (struct lexer *lexer, struct dataset *ds)
 {
-  return internal_cmd_formats (FORMATS_PRINT);
+  return internal_cmd_formats (lexer, ds, FORMATS_PRINT);
 }
 
 int
-cmd_write_formats (void)
+cmd_write_formats (struct lexer *lexer, struct dataset *ds)
 {
-  return internal_cmd_formats (FORMATS_WRITE);
+  return internal_cmd_formats (lexer, ds, FORMATS_WRITE);
 }
 
 int
-cmd_formats (void)
+cmd_formats (struct lexer *lexer, struct dataset *ds)
 {
-  return internal_cmd_formats (FORMATS_PRINT | FORMATS_WRITE);
+  return internal_cmd_formats (lexer, ds, FORMATS_PRINT | FORMATS_WRITE);
 }
 
-int
-internal_cmd_formats (int which)
+static int
+internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
 {
   /* Variables. */
   struct variable **v;
@@ -80,24 +79,24 @@ internal_cmd_formats (int which)
 
   for (;;)
     {
-      if (token == '.')
+      if (lex_token (lexer) == '.')
 	break;
 
-      if (!parse_variables (default_dict, &v, &cv, PV_NUMERIC))
+      if (!parse_variables (lexer, dataset_dict (ds), &v, &cv, PV_NUMERIC))
 	return CMD_FAILURE;
-      type = v[0]->type;
+      type = var_get_type (v[0]);
 
-      if (!lex_match ('('))
+      if (!lex_match (lexer, '('))
 	{
 	  msg (SE, _("`(' expected after variable list."));
 	  goto fail;
 	}
-      if (!parse_format_specifier (&f)
-          || !check_output_specifier (&f, true)
-          || !check_specifier_type (&f, NUMERIC, true))
+      if (!parse_format_specifier (lexer, &f)
+          || !fmt_check_output (&f)
+          || !fmt_check_type_compat (&f, VAR_NUMERIC))
 	goto fail;
 
-      if (!lex_match (')'))
+      if (!lex_match (lexer, ')'))
 	{
 	  msg (SE, _("`)' expected after output format."));
 	  goto fail;
@@ -106,9 +105,9 @@ internal_cmd_formats (int which)
       for (i = 0; i < cv; i++)
 	{
 	  if (which & FORMATS_PRINT)
-	    v[i]->print = f;
+            var_set_print_format (v[i], &f);
 	  if (which & FORMATS_WRITE)
-	    v[i]->write = f;
+            var_set_write_format (v[i], &f);
 	}
       free (v);
       v = NULL;