X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fmodify-variables.c;h=a1fe6d75df294244fe11bc168c0120e2c77f57bd;hb=56e6166660c0f1388cad4cb4d3189e026bc84dd5;hp=98a588b15be47d1d7cbd889a044b0dba6796cc9e;hpb=25bc101890a62f780da3a7c6af71ecc3ce09fdb1;p=pspp diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c index 98a588b15b..a1fe6d75df 100644 --- a/src/language/dictionary/modify-variables.c +++ b/src/language/dictionary/modify-variables.c @@ -26,7 +26,6 @@ #include "language/lexer/variable-parser.h" #include "libpspp/array.h" #include "libpspp/assertion.h" -#include "libpspp/bit-vector.h" #include "libpspp/compiler.h" #include "libpspp/i18n.h" #include "libpspp/message.h" @@ -154,7 +153,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) { if (!lex_match (lexer, T_LPAREN)) { - lex_error_expecting (lexer, "`('", NULL_SENTINEL); + lex_error_expecting (lexer, "`('"); free (v); goto done; } @@ -166,7 +165,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) } if (!lex_match (lexer, T_RPAREN)) { - lex_error_expecting (lexer, "`)'", NULL_SENTINEL); + lex_error_expecting (lexer, "`)'"); free (v); goto done; } @@ -201,7 +200,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) if (!lex_match (lexer, T_LPAREN)) { - lex_error_expecting (lexer, "`('", NULL_SENTINEL); + lex_error_expecting (lexer, "`('"); goto done; } if (!parse_variables (lexer, dataset_dict (ds), @@ -210,7 +209,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) goto done; if (!lex_match (lexer, T_EQUALS)) { - lex_error_expecting (lexer, "`='", NULL_SENTINEL); + lex_error_expecting (lexer, "`='"); goto done; } @@ -230,7 +229,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) } if (!lex_match (lexer, T_RPAREN)) { - lex_error_expecting (lexer, "`)'", NULL_SENTINEL); + lex_error_expecting (lexer, "`)'"); goto done; } } @@ -340,7 +339,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) break; if (lex_token (lexer) != T_SLASH) { - lex_error_expecting (lexer, "`/'", "`.'", NULL_SENTINEL); + lex_error_expecting (lexer, "`/'", "`.'"); goto done; } lex_get (lexer);