X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Ftests%2Fmoments-test.c;h=34408739b4ce0856d2e643737c50b71a5d9e36ab;hb=75a514035ccbe2df4058b486a48162b301dd51d0;hp=0e10b7fdab67b96b2698a402f2c9dc665660ccde;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp

diff --git a/src/language/tests/moments-test.c b/src/language/tests/moments-test.c
index 0e10b7fdab..34408739b4 100644
--- a/src/language/tests/moments-test.c
+++ b/src/language/tests/moments-test.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 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 published by
@@ -15,32 +15,35 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <stdio.h>
-#include "gettext.h"
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <math/moments.h>
+
 #include <math.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include "xalloc.h"
-#include <libpspp/compiler.h>
 
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/compiler.h"
+#include "math/moments.h"
+
+#include "gl/xalloc.h"
+
+#include "gettext.h"
 #define _(msgid) gettext (msgid)
 
 static bool
-read_values (struct lexer *lexer, double **values, double **weights, size_t *cnt)
+read_values (struct lexer *lexer, double **values, double **weights, size_t *n)
 {
   size_t cap = 0;
 
   *values = NULL;
   *weights = NULL;
-  *cnt = 0;
+  *n = 0;
   while (lex_is_number (lexer))
     {
       double value = lex_tokval (lexer);
       double weight = 1.;
       lex_get (lexer);
-      if (lex_match (lexer, '*'))
+      if (lex_match (lexer, T_ASTERISK))
         {
           if (!lex_is_number (lexer))
             {
@@ -51,16 +54,16 @@ read_values (struct lexer *lexer, double **values, double **weights, size_t *cnt
           lex_get (lexer);
         }
 
-      if (*cnt >= cap)
+      if (*n >= cap)
         {
           cap = 2 * (cap + 8);
           *values = xnrealloc (*values, cap, sizeof **values);
           *weights = xnrealloc (*weights, cap, sizeof **weights);
         }
 
-      (*values)[*cnt] = value;
-      (*weights)[*cnt] = weight;
-      (*cnt)++;
+      (*values)[*n] = value;
+      (*weights)[*n] = weight;
+      (*n)++;
     }
 
   return true;
@@ -74,32 +77,27 @@ cmd_debug_moments (struct lexer *lexer, struct dataset *ds UNUSED)
   double *weights = NULL;
   double weight, M[4];
   int two_pass = 1;
-  size_t cnt;
+  size_t n;
   size_t i;
 
   if (lex_match_id (lexer, "ONEPASS"))
     two_pass = 0;
-  if (lex_token (lexer) != '/')
-    {
-      lex_force_match (lexer, '/');
+  if (!lex_force_match (lexer, T_SLASH))
       goto done;
-    }
-  fprintf (stderr, "%s => ", lex_rest_of_line (lexer));
-  lex_get (lexer);
 
   if (two_pass)
     {
       struct moments *m = NULL;
 
       m = moments_create (MOMENT_KURTOSIS);
-      if (!read_values (lexer, &values, &weights, &cnt))
+      if (!read_values (lexer, &values, &weights, &n))
         {
           moments_destroy (m);
           goto done;
         }
-      for (i = 0; i < cnt; i++)
+      for (i = 0; i < n; i++)
         moments_pass_one (m, values[i], weights[i]);
-      for (i = 0; i < cnt; i++)
+      for (i = 0; i < n; i++)
         moments_pass_two (m, values[i], weights[i]);
       moments_calculate (m, &weight, &M[0], &M[1], &M[2], &M[3]);
       moments_destroy (m);
@@ -109,12 +107,12 @@ cmd_debug_moments (struct lexer *lexer, struct dataset *ds UNUSED)
       struct moments1 *m = NULL;
 
       m = moments1_create (MOMENT_KURTOSIS);
-      if (!read_values (lexer, &values, &weights, &cnt))
+      if (!read_values (lexer, &values, &weights, &n))
         {
           moments1_destroy (m);
           goto done;
         }
-      for (i = 0; i < cnt; i++)
+      for (i = 0; i < n; i++)
         moments1_add (m, values[i], weights[i]);
       moments1_calculate (m, &weight, &M[0], &M[1], &M[2], &M[3]);
       moments1_destroy (m);
@@ -123,7 +121,7 @@ cmd_debug_moments (struct lexer *lexer, struct dataset *ds UNUSED)
   fprintf (stderr, "W=%.3f", weight);
   for (i = 0; i < 4; i++)
     {
-      fprintf (stderr, " M%d=", (int) i + 1);
+      fprintf (stderr, " M%zu=", i + 1);
       if (M[i] == SYSMIS)
         fprintf (stderr, "sysmis");
       else if (fabs (M[i]) <= 0.0005)
@@ -133,7 +131,7 @@ cmd_debug_moments (struct lexer *lexer, struct dataset *ds UNUSED)
     }
   fprintf (stderr, "\n");
 
-  retval = lex_end_of_command (lexer);
+  retval = CMD_SUCCESS;
 
  done:
   free (values);