Encapsulated lexer and updated calling functions accordingly.

[pspp-builds.git] / src / language / tests / moments-test.c

diff --git a/src/language/tests/moments-test.c b/src/language/tests/moments-test.c
index c038a63c42fce13257b60e7b04bcc3af975b3921..893d2300d02ff8cb48b1846f86b9dfbe2e361bf8 100644 (file)
--- a/src/language/tests/moments-test.c
+++ b/src/language/tests/moments-test.c
@@ -20,34 +20,38 @@
 #include <config.h>
 #include <stdio.h>
 #include "gettext.h"
-#include "command.h"
-#include "lexer.h"
-#include "moments.h"
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <math/moments.h>
+#include <math.h>
+#include <stdlib.h>
+#include "xalloc.h"
+#include <libpspp/compiler.h>
 
 #define _(msgid) gettext (msgid)
 
-static int
-read_values (double **values, double **weights, size_t *cnt) 
+static bool
+read_values (struct lexer *lexer, double **values, double **weights, size_t *cnt) 
 {
   size_t cap = 0;
 
   *values = NULL;
   *weights = NULL;
   *cnt = 0;
-  while (lex_is_number ())
+  while (lex_is_number (lexer))
     {
-      double value = tokval;
+      double value = lex_tokval (lexer);
       double weight = 1.;
-      lex_get ();
-      if (lex_match ('*'))
+      lex_get (lexer);
+      if (lex_match (lexer, '*'))
         {
-          if (!lex_is_number ())
+          if (!lex_is_number (lexer))
             {
-              lex_error (_("expecting weight value"));
-              return 0;
+              lex_error (lexer, _("expecting weight value"));
+              return false;
             }
-          weight = tokval;
-          lex_get ();
+          weight = lex_tokval (lexer);
+          lex_get (lexer);
         }
 
       if (*cnt >= cap) 
@@ -62,11 +66,11 @@ read_values (double **values, double **weights, size_t *cnt)
       (*cnt)++;
     }
 
-  return 1;
+  return true;
 }
 
 int
-cmd_debug_moments (void) 
+cmd_debug_moments (struct lexer *lexer, struct dataset *ds UNUSED) 
 {
   int retval = CMD_FAILURE;
   double *values = NULL;
@@ -76,22 +80,22 @@ cmd_debug_moments (void)
   size_t cnt;
   size_t i;
 
-  if (lex_match_id ("ONEPASS"))
+  if (lex_match_id (lexer, "ONEPASS"))
     two_pass = 0;
-  if (token != '/') 
+  if (lex_token (lexer) != '/') 
     {
-      lex_force_match ('/');
+      lex_force_match (lexer, '/');
       goto done;
     }
-  fprintf (stderr, "%s => ", lex_rest_of_line (NULL));
-  lex_get ();
+  fprintf (stderr, "%s => ", lex_rest_of_line (lexer, NULL));
+  lex_get (lexer);
 
   if (two_pass) 
     {
       struct moments *m = NULL;
   
       m = moments_create (MOMENT_KURTOSIS);
-      if (!read_values (&values, &weights, &cnt)) 
+      if (!read_values (lexer, &values, &weights, &cnt)) 
         {
           moments_destroy (m);
           goto done; 
@@ -108,7 +112,7 @@ cmd_debug_moments (void)
       struct moments1 *m = NULL;
   
       m = moments1_create (MOMENT_KURTOSIS);
-      if (!read_values (&values, &weights, &cnt)) 
+      if (!read_values (lexer, &values, &weights, &cnt)) 
         {
           moments1_destroy (m);
           goto done; 
@@ -132,7 +136,7 @@ cmd_debug_moments (void)
     }
   fprintf (stderr, "\n");
 
-  retval = lex_end_of_command ();
+  retval = lex_end_of_command (lexer);
   
  done:
   free (values);