Mercurial > vim
comparison src/evalvars.c @ 26877:06a137af96f8 v8.2.3967
patch 8.2.3967: error messages are spread out
Commit: https://github.com/vim/vim/commit/460ae5dfca31fa627531c263184849976755cf6b
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 1 14:19:49 2022 +0000
patch 8.2.3967: error messages are spread out
Problem: Error messages are spread out.
Solution: Move more errors to errors.h.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 01 Jan 2022 15:30:05 +0100 |
parents | bce848ec8b1b |
children | fb67cd7d30a7 |
comparison
equal
deleted
inserted
replaced
26876:601a973ac16c | 26877:06a137af96f8 |
---|---|
953 } | 953 } |
954 | 954 |
955 // ":let [v1, v2] = list" or ":for [v1, v2] in listlist" | 955 // ":let [v1, v2] = list" or ":for [v1, v2] in listlist" |
956 if (tv->v_type != VAR_LIST || (l = tv->vval.v_list) == NULL) | 956 if (tv->v_type != VAR_LIST || (l = tv->vval.v_list) == NULL) |
957 { | 957 { |
958 emsg(_(e_listreq)); | 958 emsg(_(e_list_required)); |
959 return FAIL; | 959 return FAIL; |
960 } | 960 } |
961 | 961 |
962 i = list_len(l); | 962 i = list_len(l); |
963 if (semicolon == 0 && var_count < i) | 963 if (semicolon == 0 && var_count < i) |
1318 if (len == 0) | 1318 if (len == 0) |
1319 semsg(_(e_invalid_argument_str), name - 1); | 1319 semsg(_(e_invalid_argument_str), name - 1); |
1320 else | 1320 else |
1321 { | 1321 { |
1322 if (op != NULL && vim_strchr((char_u *)"+-*/%", *op) != NULL) | 1322 if (op != NULL && vim_strchr((char_u *)"+-*/%", *op) != NULL) |
1323 semsg(_(e_letwrong), op); | 1323 semsg(_(e_wrong_variable_type_for_str_equal), op); |
1324 else if (endchars != NULL | 1324 else if (endchars != NULL |
1325 && vim_strchr(endchars, *skipwhite(arg)) == NULL) | 1325 && vim_strchr(endchars, *skipwhite(arg)) == NULL) |
1326 emsg(_(e_unexpected_characters_in_let)); | 1326 emsg(_(e_unexpected_characters_in_let)); |
1327 else if (!check_secure()) | 1327 else if (!check_secure()) |
1328 { | 1328 { |
1372 char_u *arg_end = NULL; | 1372 char_u *arg_end = NULL; |
1373 | 1373 |
1374 if ((flags & (ASSIGN_CONST | ASSIGN_FINAL)) | 1374 if ((flags & (ASSIGN_CONST | ASSIGN_FINAL)) |
1375 && (flags & ASSIGN_FOR_LOOP) == 0) | 1375 && (flags & ASSIGN_FOR_LOOP) == 0) |
1376 { | 1376 { |
1377 emsg(_(e_const_option)); | 1377 emsg(_(e_cannot_lock_an_option)); |
1378 return NULL; | 1378 return NULL; |
1379 } | 1379 } |
1380 | 1380 |
1381 // Find the end of the name. | 1381 // Find the end of the name. |
1382 p = find_option_end(&arg, &scope); | 1382 p = find_option_end(&arg, &scope); |
1432 if (op != NULL && *op != '=') | 1432 if (op != NULL && *op != '=') |
1433 { | 1433 { |
1434 if (((opt_type == gov_bool || opt_type == gov_number) && *op == '.') | 1434 if (((opt_type == gov_bool || opt_type == gov_number) && *op == '.') |
1435 || (opt_type == gov_string && *op != '.')) | 1435 || (opt_type == gov_string && *op != '.')) |
1436 { | 1436 { |
1437 semsg(_(e_letwrong), op); | 1437 semsg(_(e_wrong_variable_type_for_str_equal), op); |
1438 failed = TRUE; // don't set the value | 1438 failed = TRUE; // don't set the value |
1439 | 1439 |
1440 } | 1440 } |
1441 else | 1441 else |
1442 { | 1442 { |
1473 { | 1473 { |
1474 set_option_value(arg, n, s, scope); | 1474 set_option_value(arg, n, s, scope); |
1475 arg_end = p; | 1475 arg_end = p; |
1476 } | 1476 } |
1477 else | 1477 else |
1478 emsg(_(e_stringreq)); | 1478 emsg(_(e_string_required)); |
1479 } | 1479 } |
1480 *p = c1; | 1480 *p = c1; |
1481 vim_free(stringval); | 1481 vim_free(stringval); |
1482 vim_free(tofree); | 1482 vim_free(tofree); |
1483 } | 1483 } |
1503 emsg(_("E996: Cannot lock a register")); | 1503 emsg(_("E996: Cannot lock a register")); |
1504 return NULL; | 1504 return NULL; |
1505 } | 1505 } |
1506 ++arg; | 1506 ++arg; |
1507 if (op != NULL && vim_strchr((char_u *)"+-*/%", *op) != NULL) | 1507 if (op != NULL && vim_strchr((char_u *)"+-*/%", *op) != NULL) |
1508 semsg(_(e_letwrong), op); | 1508 semsg(_(e_wrong_variable_type_for_str_equal), op); |
1509 else if (endchars != NULL | 1509 else if (endchars != NULL |
1510 && vim_strchr(endchars, *skipwhite(arg + 1)) == NULL) | 1510 && vim_strchr(endchars, *skipwhite(arg + 1)) == NULL) |
1511 emsg(_(e_unexpected_characters_in_let)); | 1511 emsg(_(e_unexpected_characters_in_let)); |
1512 else | 1512 else |
1513 { | 1513 { |
3307 int free_tv_arg = !copy; // free tv_arg if not used | 3307 int free_tv_arg = !copy; // free tv_arg if not used |
3308 | 3308 |
3309 ht = find_var_ht(name, &varname); | 3309 ht = find_var_ht(name, &varname); |
3310 if (ht == NULL || *varname == NUL) | 3310 if (ht == NULL || *varname == NUL) |
3311 { | 3311 { |
3312 semsg(_(e_illvar), name); | 3312 semsg(_(e_illegal_variable_name_str), name); |
3313 goto failed; | 3313 goto failed; |
3314 } | 3314 } |
3315 is_script_local = ht == get_script_local_ht(); | 3315 is_script_local = ht == get_script_local_ht(); |
3316 | 3316 |
3317 if (vim9script | 3317 if (vim9script |
3401 if ((di->di_flags & DI_FLAGS_RELOAD) == 0) | 3401 if ((di->di_flags & DI_FLAGS_RELOAD) == 0) |
3402 { | 3402 { |
3403 if ((flags & (ASSIGN_CONST | ASSIGN_FINAL)) | 3403 if ((flags & (ASSIGN_CONST | ASSIGN_FINAL)) |
3404 && (flags & ASSIGN_FOR_LOOP) == 0) | 3404 && (flags & ASSIGN_FOR_LOOP) == 0) |
3405 { | 3405 { |
3406 emsg(_(e_cannot_mod)); | 3406 emsg(_(e_cannot_modify_existing_variable)); |
3407 goto failed; | 3407 goto failed; |
3408 } | 3408 } |
3409 | 3409 |
3410 if (is_script_local && vim9script | 3410 if (is_script_local && vim9script |
3411 && (flags & (ASSIGN_NO_DECL | ASSIGN_DECL)) == 0) | 3411 && (flags & (ASSIGN_NO_DECL | ASSIGN_DECL)) == 0) |
3516 } | 3516 } |
3517 | 3517 |
3518 // Can't add "v:" or "a:" variable. | 3518 // Can't add "v:" or "a:" variable. |
3519 if (ht == &vimvarht || ht == get_funccal_args_ht()) | 3519 if (ht == &vimvarht || ht == get_funccal_args_ht()) |
3520 { | 3520 { |
3521 semsg(_(e_illvar), name); | 3521 semsg(_(e_illegal_variable_name_str), name); |
3522 goto failed; | 3522 goto failed; |
3523 } | 3523 } |
3524 | 3524 |
3525 // Make sure the variable name is valid. In Vim9 script an autoload | 3525 // Make sure the variable name is valid. In Vim9 script an autoload |
3526 // variable must be prefixed with "g:". | 3526 // variable must be prefixed with "g:". |
3746 | 3746 |
3747 for (p = varname; len < 0 ? *p != NUL : p < varname + len; ++p) | 3747 for (p = varname; len < 0 ? *p != NUL : p < varname + len; ++p) |
3748 if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p)) | 3748 if (!eval_isnamec1(*p) && (p == varname || !VIM_ISDIGIT(*p)) |
3749 && !(autoload && *p == AUTOLOAD_CHAR)) | 3749 && !(autoload && *p == AUTOLOAD_CHAR)) |
3750 { | 3750 { |
3751 semsg(_(e_illvar), varname); | 3751 semsg(_(e_illegal_variable_name_str), varname); |
3752 return FALSE; | 3752 return FALSE; |
3753 } | 3753 } |
3754 return TRUE; | 3754 return TRUE; |
3755 } | 3755 } |
3756 | 3756 |