X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fexpressions%2Fparse.c;h=5054b6932105e9e8358065968e70efb9d78829b0;hb=369c24f1d085a41ec274ebae5fc198fcee567653;hp=7b845a8d369ebf6da4b736db7c7028cc1ad9814b;hpb=6f3865480503c571963d8a2d1af858a4d72d4e88;p=pspp diff --git a/src/language/expressions/parse.c b/src/language/expressions/parse.c index 7b845a8d36..5054b69321 100644 --- a/src/language/expressions/parse.c +++ b/src/language/expressions/parse.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006, 2010, 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2010, 2011, 2012, 2014 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 @@ -1270,7 +1270,7 @@ parse_function (struct lexer *lexer, struct expression *e) break; else if (!lex_match (lexer, T_COMMA)) { - lex_error_expecting (lexer, "`,'", "`)'", NULL_SENTINEL); + lex_error_expecting (lexer, "`,'", "`)'"); goto fail; } } @@ -1292,13 +1292,14 @@ parse_function (struct lexer *lexer, struct expression *e) msg (SW, _("%s is a PSPP extension."), f->prototype); if (f->flags & OPF_UNIMPLEMENTED) { - msg (SE, _("%s is not yet implemented."), f->prototype); + msg (SE, _("%s is not available in this version of PSPP."), + f->prototype); goto fail; } if ((f->flags & OPF_PERM_ONLY) && proc_in_temporary_transformations (e->ds)) { - msg (SE, _("%s may not appear after TEMPORARY."), f->prototype); + msg (SE, _("%s may not appear after %s."), f->prototype, "TEMPORARY"); goto fail; }