Mercurial > vim

comparison src/evalfunc.c @ 26877:06a137af96f8 v8.2.3967

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 be85735650f7
children 7f150a4936f2
comparison
equal deleted inserted replaced
26876:601a973ac16c 26877:06a137af96f8
2933 || check_for_opt_dict_arg(argvars, 2) == FAIL)) 2933 || check_for_opt_dict_arg(argvars, 2) == FAIL))
2934 return; 2934 return;
2935 2935
2936 if (argvars[1].v_type != VAR_LIST) 2936 if (argvars[1].v_type != VAR_LIST)
2937 { 2937 {
2938 emsg(_(e_listreq)); 2938 emsg(_(e_list_required));
2939 return; 2939 return;
2940 } 2940 }
2941 if (argvars[1].vval.v_list == NULL) 2941 if (argvars[1].vval.v_list == NULL)
2942 return; 2942 return;
2943 2943
2955 2955
2956 if (argvars[2].v_type != VAR_UNKNOWN) 2956 if (argvars[2].v_type != VAR_UNKNOWN)
2957 { 2957 {
2958 if (argvars[2].v_type != VAR_DICT) 2958 if (argvars[2].v_type != VAR_DICT)
2959 { 2959 {
2960 emsg(_(e_dictreq)); 2960 emsg(_(e_dictionary_required));
2961 return; 2961 return;
2962 } 2962 }
2963 selfdict = argvars[2].vval.v_dict; 2963 selfdict = argvars[2].vval.v_dict;
2964 } 2964 }
2965 2965
4409 if (!what_is_dict) 4409 if (!what_is_dict)
4410 return; 4410 return;
4411 } 4411 }
4412 } 4412 }
4413 else 4413 else
4414 semsg(_(e_listdictblobarg), "get()"); 4414 semsg(_(e_argument_of_str_must_be_list_dictionary_or_blob), "get()");
4415 4415
4416 if (tv == NULL) 4416 if (tv == NULL)
4417 { 4417 {
4418 if (argvars[2].v_type != VAR_UNKNOWN) 4418 if (argvars[2].v_type != VAR_UNKNOWN)
4419 copy_tv(&argvars[2], rettv); 4419 copy_tv(&argvars[2], rettv);
6456 } 6456 }
6457 return; 6457 return;
6458 } 6458 }
6459 else if (argvars[0].v_type != VAR_LIST) 6459 else if (argvars[0].v_type != VAR_LIST)
6460 { 6460 {
6461 emsg(_(e_listblobreq)); 6461 emsg(_(e_list_or_blob_required));
6462 return; 6462 return;
6463 } 6463 }
6464 6464
6465 l = argvars[0].vval.v_list; 6465 l = argvars[0].vval.v_list;
6466 if (l != NULL) 6466 if (l != NULL)
6716 } 6716 }
6717 } 6717 }
6718 else if (lv.ll_range) 6718 else if (lv.ll_range)
6719 emsg(_("E786: Range not allowed")); 6719 emsg(_("E786: Range not allowed"));
6720 else if (lv.ll_newkey != NULL) 6720 else if (lv.ll_newkey != NULL)
6721 semsg(_(e_dictkey), lv.ll_newkey); 6721 semsg(_(e_key_not_present_in_dictionary), lv.ll_newkey);
6722 else if (lv.ll_list != NULL) 6722 else if (lv.ll_list != NULL)
6723 // List item. 6723 // List item.
6724 rettv->vval.v_number = tv_islocked(&lv.ll_li->li_tv); 6724 rettv->vval.v_number = tv_islocked(&lv.ll_li->li_tv);
6725 else 6725 else
6726 // Dictionary item. 6726 // Dictionary item.
7309 } 7309 }
7310 } 7310 }
7311 } 7311 }
7312 } 7312 }
7313 else 7313 else
7314 semsg(_(e_listdictarg), domax ? "max()" : "min()"); 7314 semsg(_(e_argument_of_str_must_be_list_or_dictionary), domax ? "max()" : "min()");
7315 7315
7316 rettv->vval.v_number = n; 7316 rettv->vval.v_number = n;
7317 } 7317 }
7318 7318
7319 /* 7319 /*
8875 if (in_vim9script() && check_for_dict_arg(argvars, 0) == FAIL) 8875 if (in_vim9script() && check_for_dict_arg(argvars, 0) == FAIL)
8876 return; 8876 return;
8877 8877
8878 if (argvars[0].v_type != VAR_DICT) 8878 if (argvars[0].v_type != VAR_DICT)
8879 { 8879 {
8880 emsg(_(e_dictreq)); 8880 emsg(_(e_dictionary_required));
8881 return; 8881 return;
8882 } 8882 }
8883 8883
8884 if ((d = argvars[0].vval.v_dict) != NULL) 8884 if ((d = argvars[0].vval.v_dict) != NULL)
8885 { 8885 {
9219 return; 9219 return;
9220 9220
9221 // second argument: dict with items to set in the tag stack 9221 // second argument: dict with items to set in the tag stack
9222 if (argvars[1].v_type != VAR_DICT) 9222 if (argvars[1].v_type != VAR_DICT)
9223 { 9223 {
9224 emsg(_(e_dictreq)); 9224 emsg(_(e_dictionary_required));
9225 return; 9225 return;
9226 } 9226 }
9227 d = argvars[1].vval.v_dict; 9227 d = argvars[1].vval.v_dict;
9228 if (d == NULL) 9228 if (d == NULL)
9229 return; 9229 return;
9247 return; 9247 return;
9248 } 9248 }
9249 } 9249 }
9250 else 9250 else
9251 { 9251 {
9252 emsg(_(e_stringreq)); 9252 emsg(_(e_string_required));
9253 return; 9253 return;
9254 } 9254 }
9255 9255
9256 if (set_tagstack(wp, d, action) == OK) 9256 if (set_tagstack(wp, d, action) == OK)
9257 rettv->vval.v_number = 0; 9257 rettv->vval.v_number = 0;
9363 curwin->w_p_spell = TRUE; 9363 curwin->w_p_spell = TRUE;
9364 } 9364 }
9365 9365
9366 if (*curwin->w_s->b_p_spl == NUL) 9366 if (*curwin->w_s->b_p_spl == NUL)
9367 { 9367 {
9368 emsg(_(e_no_spell)); 9368 emsg(_(e_spell_checking_is_not_possible));
9369 curwin->w_p_spell = wo_spell_save; 9369 curwin->w_p_spell = wo_spell_save;
9370 return; 9370 return;
9371 } 9371 }
9372 #endif 9372 #endif
9373 9373
9453 curwin->w_p_spell = TRUE; 9453 curwin->w_p_spell = TRUE;
9454 } 9454 }
9455 9455
9456 if (*curwin->w_s->b_p_spl == NUL) 9456 if (*curwin->w_s->b_p_spl == NUL)
9457 { 9457 {
9458 emsg(_(e_no_spell)); 9458 emsg(_(e_spell_checking_is_not_possible));
9459 curwin->w_p_spell = wo_spell_save; 9459 curwin->w_p_spell = wo_spell_save;
9460 return; 9460 return;
9461 } 9461 }
9462 #endif 9462 #endif
9463 9463