X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Ftests%2Fmoments-test.c;h=f5fc858dd4d2b130f0af647f14ad7483e92dc311;hb=refs%2Fbuilds%2F20101231030502%2Fpspp;hp=91a679394ca20a22a8bc3d9927c1f4bb7678861d;hpb=9f4661992f4b481c6dafa6fd53c94ecfe7b3af8c;p=pspp diff --git a/src/language/tests/moments-test.c b/src/language/tests/moments-test.c index 91a679394c..f5fc858dd4 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 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 @@ -40,7 +40,7 @@ read_values (struct lexer *lexer, double **values, double **weights, size_t *cnt 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)) { @@ -79,12 +79,11 @@ cmd_debug_moments (struct lexer *lexer, struct dataset *ds UNUSED) if (lex_match_id (lexer, "ONEPASS")) two_pass = 0; - if (lex_token (lexer) != '/') + if (lex_token (lexer) != T_SLASH) { - lex_force_match (lexer, '/'); + lex_force_match (lexer, T_SLASH); goto done; } - fprintf (stderr, "%s => ", lex_rest_of_line (lexer)); lex_get (lexer); if (two_pass)