use moments.c to compute moments

[pspp] / src / language / dictionary / numeric.c

diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c
index b7ad96eb7440d9eb7cb5dc244c3aa00eee4bb9dd..0cf08ae53770a18dba7fe21a1be940f0cd28033f 100644 (file)
--- a/src/language/dictionary/numeric.c
+++ b/src/language/dictionary/numeric.c
@@ -1,6 +1,5 @@
 /* PSPP - computes sample statistics.
    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
    modify it under the terms of the GNU General Public License as
@@ -85,7 +84,7 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
          else
            {
              if (f.type != -1)
-               new_var->print = new_var->write = f;
+                var_set_both_formats (new_var, &f);
            }
        }
 
@@ -152,7 +151,7 @@ cmd_string (struct lexer *lexer, struct dataset *ds)
          if (!new_var)
            msg (SE, _("There is already a variable named %s."), v[i]);
          else
-            new_var->print = new_var->write = f;
+            var_set_both_formats (new_var, &f);
        }
 
       /* Clean up. */
@@ -185,7 +184,7 @@ cmd_leave (struct lexer *lexer, struct dataset *ds)
   if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
     return CMD_CASCADING_FAILURE;
   for (i = 0; i < nv; i++)
-    v[i]->leave = true;
+    var_set_leave (v[i], true);
   free (v);
 
   return lex_end_of_command (lexer);