X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fdictionary%2Fmodify-variables.c;h=6afd321590a7d63f0721c370561e2139c0693ee4;hb=691c25e36fd1ee722dd35419d6110e3876b99f9c;hp=d9a72f3549eab1b61086b4322b06b9b44a55fe4c;hpb=9f087e7aa4cdff1d5d46d5e188c0017a9d2d0029;p=pspp-builds.git diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c index d9a72f35..6afd3215 100644 --- a/src/language/dictionary/modify-variables.c +++ b/src/language/dictionary/modify-variables.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 @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -101,7 +100,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) vm.drop_cnt = 0; /* Parse each subcommand. */ - lex_match (lexer, '/'); + lex_match (lexer, T_SLASH); for (;;) { if (lex_match_id (lexer, "REORDER")) @@ -111,12 +110,12 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) if (already_encountered & 1) { - msg (SE, _("REORDER subcommand may be given at most once.")); + msg (SE, _("%s subcommand may be given at most once."), "REORDER"); goto done; } already_encountered |= 1; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); do { struct ordering ordering; @@ -130,7 +129,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) else if (lex_match_id (lexer, "ALPHA")) ordering.positional = 0; - if (lex_match (lexer, T_ALL) || lex_token (lexer) == '/' || lex_token (lexer) == '.') + if (lex_match (lexer, T_ALL) || lex_token (lexer) == T_SLASH || lex_token (lexer) == T_ENDCMD) { if (prev_nv != 0) { @@ -138,13 +137,13 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) "of variables.")); goto done; } - dict_get_vars_mutable (dataset_dict (ds), &v, &nv, 1u << DC_SYSTEM); + dict_get_vars_mutable (dataset_dict (ds), &v, &nv, DC_SYSTEM); } else { - if (!lex_match (lexer, '(')) + if (!lex_match (lexer, T_LPAREN)) { - msg (SE, _("`(' expected on REORDER subcommand.")); + msg (SE, _("`(' expected on %s subcommand."), "REORDER"); free (v); goto done; } @@ -154,7 +153,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) free (v); goto done; } - if (!lex_match (lexer, ')')) + if (!lex_match (lexer, T_RPAREN)) { msg (SE, _("`)' expected following variable names on " "REORDER subcommand.")); @@ -165,7 +164,8 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) sort (&v[prev_nv], nv - prev_nv, sizeof *v, compare_variables_given_ordering, &ordering); } - while (lex_token (lexer) != '/' && lex_token (lexer) != '.'); + while (lex_token (lexer) != T_SLASH + && lex_token (lexer) != T_ENDCMD); vm.reorder_vars = v; vm.reorder_cnt = nv; @@ -174,27 +174,27 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) { if (already_encountered & 2) { - msg (SE, _("RENAME subcommand may be given at most once.")); + msg (SE, _("%s subcommand may be given at most once."), "RENAME"); goto done; } already_encountered |= 2; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); do { size_t prev_nv_1 = vm.rename_cnt; size_t prev_nv_2 = vm.rename_cnt; - if (!lex_match (lexer, '(')) + if (!lex_match (lexer, T_LPAREN)) { - msg (SE, _("`(' expected on RENAME subcommand.")); + msg (SE, _("`(' expected on %s subcommand."), "RENAME"); goto done; } if (!parse_variables (lexer, dataset_dict (ds), &vm.rename_vars, &vm.rename_cnt, PV_APPEND | PV_NO_DUPLICATE)) goto done; - if (!lex_match (lexer, '=')) + if (!lex_match (lexer, T_EQUALS)) { msg (SE, _("`=' expected between lists of new and old variable " "names on RENAME subcommand.")); @@ -206,23 +206,23 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) if (prev_nv_1 != vm.rename_cnt) { msg (SE, _("Differing number of variables in old name list " - "(%d) and in new name list (%d)."), - (int) (vm.rename_cnt - prev_nv_2), - (int) (prev_nv_1 - prev_nv_2)); + "(%zu) and in new name list (%zu)."), + vm.rename_cnt - prev_nv_2, prev_nv_1 - prev_nv_2); for (i = 0; i < prev_nv_1; i++) free (vm.new_names[i]); free (vm.new_names); vm.new_names = NULL; goto done; } - if (!lex_match (lexer, ')')) + if (!lex_match (lexer, T_RPAREN)) { msg (SE, _("`)' expected after variable lists on RENAME " "subcommand.")); goto done; } } - while (lex_token (lexer) != '.' && lex_token (lexer) != '/'); + while (lex_token (lexer) != T_ENDCMD + && lex_token (lexer) != T_SLASH); } else if (lex_match_id (lexer, "KEEP")) { @@ -237,7 +237,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) } already_encountered |= 4; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (!parse_variables (lexer, dataset_dict (ds), &keep_vars, &keep_cnt, PV_NONE)) goto done; @@ -281,7 +281,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) } already_encountered |= 4; - lex_match (lexer, '='); + lex_match (lexer, T_EQUALS); if (!parse_variables (lexer, dataset_dict (ds), &drop_vars, &drop_cnt, PV_NONE)) goto done; vm.drop_vars = drop_vars; @@ -306,9 +306,9 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds) goto done; } - if (lex_token (lexer) == '.') + if (lex_token (lexer) == T_ENDCMD) break; - if (lex_token (lexer) != '/') + if (lex_token (lexer) != T_SLASH) { msg (SE, _("`/' or `.' expected.")); goto done; @@ -368,7 +368,7 @@ compare_variables_given_ordering (const void *a_, const void *b_, struct var_renaming { struct variable *var; - char new_name[LONG_NAME_LEN + 1]; + char new_name[VAR_NAME_LEN + 1]; }; /* A algo_compare_func that compares new_name members in struct