X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fformats.c;h=de58615619f1548a772b3cdba64cb4e3143a25f9;hb=bd50b397b3ed4e7e627c33e234a5d0394e2c3dc6;hp=640246c9df2a8b86b571b036ae78f05a3bc83535;hpb=392ab4052e2743f80664a4130b2b4ee5d82af7fe;p=pspp diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c index 640246c9df..de58615619 100644 --- a/src/language/dictionary/formats.c +++ b/src/language/dictionary/formats.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 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 @@ -78,14 +78,14 @@ internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which) for (;;) { - if (lex_token (lexer) == '.') + if (lex_token (lexer) == T_ENDCMD) break; if (!parse_variables (lexer, dataset_dict (ds), &v, &cv, PV_NUMERIC)) return CMD_FAILURE; type = var_get_type (v[0]); - if (!lex_match (lexer, '(')) + if (!lex_match (lexer, T_LPAREN)) { msg (SE, _("`(' expected after variable list.")); goto fail; @@ -95,7 +95,7 @@ internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which) || !fmt_check_type_compat (&f, VAL_NUMERIC)) goto fail; - if (!lex_match (lexer, ')')) + if (!lex_match (lexer, T_RPAREN)) { msg (SE, _("`)' expected after output format.")); goto fail;