Mercurial > vim
diff src/list.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 | 612339679616 |
line wrap: on
line diff
--- a/src/list.c +++ b/src/list.c @@ -524,7 +524,7 @@ list_find_str(list_T *l, long idx) li = list_find(l, idx - 1); if (li == NULL) { - semsg(_(e_listidx), idx); + semsg(_(e_list_index_out_of_range_nr), idx); return NULL; } return tv_get_string(&li->li_tv); @@ -782,7 +782,7 @@ check_range_index_one(list_T *l, long *n if (li == NULL) { if (!quiet) - semsg(_(e_listidx), *n1); + semsg(_(e_list_index_out_of_range_nr), *n1); return NULL; } } @@ -810,7 +810,7 @@ check_range_index_two( if (ni == NULL) { if (!quiet) - semsg(_(e_listidx), *n2); + semsg(_(e_list_index_out_of_range_nr), *n2); return FAIL; } *n2 = list_idx_of_item(l, ni); @@ -822,7 +822,7 @@ check_range_index_two( if (*n2 < *n1) { if (!quiet) - semsg(_(e_listidx), *n2); + semsg(_(e_list_index_out_of_range_nr), *n2); return FAIL; } return OK; @@ -1163,7 +1163,7 @@ list_slice_or_index( if (!range) { if (verbose) - semsg(_(e_listidx), (long)n1_arg); + semsg(_(e_list_index_out_of_range_nr), (long)n1_arg); return FAIL; } if (in_vim9script()) @@ -1449,7 +1449,7 @@ f_join(typval_T *argvars, typval_T *rett if (argvars[0].v_type != VAR_LIST) { - emsg(_(e_listreq)); + emsg(_(e_list_required)); return; } rettv->v_type = VAR_STRING; @@ -1551,7 +1551,7 @@ eval_list(char_u **arg, typval_T *rettv, if (**arg != ']') { if (do_error) - semsg(_(e_list_end), *arg); + semsg(_(e_missing_end_of_list_rsb_str), *arg); failret: if (evaluate) list_free(l); @@ -1725,7 +1725,7 @@ list_remove(typval_T *argvars, typval_T if ((item = list_find(l, idx)) == NULL) { - semsg(_(e_listidx), idx); + semsg(_(e_list_index_out_of_range_nr), idx); return; } @@ -1745,7 +1745,7 @@ list_remove(typval_T *argvars, typval_T if ((item2 = list_find(l, end)) == NULL) { - semsg(_(e_listidx), end); + semsg(_(e_list_index_out_of_range_nr), end); return; } @@ -2174,7 +2174,7 @@ parse_sort_uniq_args(typval_T *argvars, // optional third argument: {dict} if (argvars[2].v_type != VAR_DICT) { - emsg(_(e_dictreq)); + emsg(_(e_dictionary_required)); return FAIL; } info->item_compare_selfdict = argvars[2].vval.v_dict; @@ -2598,7 +2598,7 @@ f_add(typval_T *argvars, typval_T *rettv else if (argvars[0].v_type == VAR_BLOB) blob_add(argvars, rettv); else - emsg(_(e_listblobreq)); + emsg(_(e_list_or_blob_required)); } /* @@ -2622,7 +2622,7 @@ list_count(list_T *l, typval_T *needle, li = list_find(l, idx); if (li == NULL) { - semsg(_(e_listidx), idx); + semsg(_(e_list_index_out_of_range_nr), idx); return 0; } @@ -2675,7 +2675,7 @@ f_count(typval_T *argvars, typval_T *ret n = dict_count(argvars[0].vval.v_dict, &argvars[1], ic); } else - semsg(_(e_listdictarg), "count()"); + semsg(_(e_argument_of_str_must_be_list_or_dictionary), "count()"); rettv->vval.v_number = n; } @@ -2728,7 +2728,7 @@ list_extend_func( item = list_find(l1, before); if (item == NULL) { - semsg(_(e_listidx), before); + semsg(_(e_list_index_out_of_range_nr), before); return; } } @@ -2773,7 +2773,7 @@ extend(typval_T *argvars, typval_T *rett else if (argvars[0].v_type == VAR_DICT && argvars[1].v_type == VAR_DICT) dict_extend_func(argvars, type, func_name, arg_errmsg, is_new, rettv); else - semsg(_(e_listdictarg), func_name); + semsg(_(e_argument_of_str_must_be_list_or_dictionary), func_name); if (type != NULL) clear_type_list(&type_list); @@ -2833,7 +2833,7 @@ list_insert_func(typval_T *argvars, typv item = list_find(l, before); if (item == NULL) { - semsg(_(e_listidx), before); + semsg(_(e_list_index_out_of_range_nr), before); l = NULL; } } @@ -2890,7 +2890,7 @@ f_remove(typval_T *argvars, typval_T *re else if (argvars[0].v_type == VAR_LIST) list_remove(argvars, rettv, arg_errmsg); else - semsg(_(e_listdictblobarg), "remove()"); + semsg(_(e_argument_of_str_must_be_list_dictionary_or_blob), "remove()"); } static void @@ -2969,7 +2969,7 @@ list_reduce( { if (l == NULL || l->lv_first == NULL) { - semsg(_(e_reduceempty), "List"); + semsg(_(e_reduce_of_an_empty_str_with_no_initial_value), "List"); return; } initial = l->lv_first->li_tv;