Mercurial > vim

comparison src/evalfunc.c @ 26865:bce848ec8b1b v8.2.3961

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3961: error messages are spread out Commit: https://github.com/vim/vim/commit/436b5adc9770a2568209dd5ab1f98bd1afc91898 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 31 22:49:24 2021 +0000 patch 8.2.3961: 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 00:00:04 +0100
parents 08508fc809cc
children be85735650f7
comparison
equal deleted inserted replaced
26864:eb95ad159bce 26865:bce848ec8b1b
3186 pos_T pos; 3186 pos_T pos;
3187 colnr_T curswant = -1; 3187 colnr_T curswant = -1;
3188 3188
3189 if (list2fpos(argvars, &pos, NULL, &curswant, charcol) == FAIL) 3189 if (list2fpos(argvars, &pos, NULL, &curswant, charcol) == FAIL)
3190 { 3190 {
3191 emsg(_(e_invarg)); 3191 emsg(_(e_invalid_argument));
3192 return; 3192 return;
3193 } 3193 }
3194 line = pos.lnum; 3194 line = pos.lnum;
3195 col = pos.col; 3195 col = pos.col;
3196 coladd = pos.coladd; 3196 coladd = pos.coladd;
3205 && (argvars[1].v_type == VAR_NUMBER || 3205 && (argvars[1].v_type == VAR_NUMBER ||
3206 argvars[1].v_type == VAR_STRING)) 3206 argvars[1].v_type == VAR_STRING))
3207 { 3207 {
3208 line = tv_get_lnum(argvars); 3208 line = tv_get_lnum(argvars);
3209 if (line < 0) 3209 if (line < 0)
3210 semsg(_(e_invarg2), tv_get_string(&argvars[0])); 3210 semsg(_(e_invalid_argument_str), tv_get_string(&argvars[0]));
3211 col = (long)tv_get_number_chk(&argvars[1], NULL); 3211 col = (long)tv_get_number_chk(&argvars[1], NULL);
3212 if (charcol) 3212 if (charcol)
3213 col = buf_charidx_to_byteidx(curbuf, line, col) + 1; 3213 col = buf_charidx_to_byteidx(curbuf, line, col) + 1;
3214 if (argvars[2].v_type != VAR_UNKNOWN) 3214 if (argvars[2].v_type != VAR_UNKNOWN)
3215 coladd = (long)tv_get_number_chk(&argvars[2], NULL); 3215 coladd = (long)tv_get_number_chk(&argvars[2], NULL);
3216 } 3216 }
3217 else 3217 else
3218 { 3218 {
3219 emsg(_(e_invarg)); 3219 emsg(_(e_invalid_argument));
3220 return; 3220 return;
3221 } 3221 }
3222 if (line < 0 || col < 0 || coladd < 0) 3222 if (line < 0 || col < 0 || coladd < 0)
3223 return; // type error; errmsg already given 3223 return; // type error; errmsg already given
3224 if (line > 0) 3224 if (line > 0)
3263 if (in_vim9script() && check_for_number_arg(argvars, 0) == FAIL) 3263 if (in_vim9script() && check_for_number_arg(argvars, 0) == FAIL)
3264 return; 3264 return;
3265 3265
3266 pid = (int)tv_get_number(&argvars[0]); 3266 pid = (int)tv_get_number(&argvars[0]);
3267 if (pid == 0) 3267 if (pid == 0)
3268 emsg(_(e_invarg)); 3268 emsg(_(e_invalid_argument));
3269 else 3269 else
3270 { 3270 {
3271 HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS, 0, pid); 3271 HANDLE hProcess = OpenProcess(PROCESS_ALL_ACCESS, 0, pid);
3272 3272
3273 if (hProcess != NULL) 3273 if (hProcess != NULL)
4092 s = tv_get_string(&argvars[0]); 4092 s = tv_get_string(&argvars[0]);
4093 use_string = TRUE; 4093 use_string = TRUE;
4094 } 4094 }
4095 if (s == NULL) 4095 if (s == NULL)
4096 { 4096 {
4097 semsg(_(e_invarg2), "NULL"); 4097 semsg(_(e_invalid_argument_str), "NULL");
4098 return; 4098 return;
4099 } 4099 }
4100 4100
4101 if ((use_string && vim_strchr(s, AUTOLOAD_CHAR) == NULL) || is_funcref) 4101 if ((use_string && vim_strchr(s, AUTOLOAD_CHAR) == NULL) || is_funcref)
4102 { 4102 {
4107 s = NULL; 4107 s = NULL;
4108 } 4108 }
4109 4109
4110 if (s == NULL || *s == NUL || (use_string && VIM_ISDIGIT(*s)) 4110 if (s == NULL || *s == NUL || (use_string && VIM_ISDIGIT(*s))
4111 || (is_funcref && trans_name == NULL)) 4111 || (is_funcref && trans_name == NULL))
4112 semsg(_(e_invarg2), use_string ? tv_get_string(&argvars[0]) : s); 4112 semsg(_(e_invalid_argument_str), use_string ? tv_get_string(&argvars[0]) : s);
4113 // Don't check an autoload name for existence here. 4113 // Don't check an autoload name for existence here.
4114 else if (trans_name != NULL && (is_funcref 4114 else if (trans_name != NULL && (is_funcref
4115 ? find_func(trans_name, is_global, NULL) == NULL 4115 ? find_func(trans_name, is_global, NULL) == NULL
4116 : !translated_function_exists(trans_name, is_global))) 4116 : !translated_function_exists(trans_name, is_global)))
4117 semsg(_("E700: Unknown function: %s"), s); 4117 semsg(_("E700: Unknown function: %s"), s);
4400 for (i = 0; i < pt->pt_argc; ++i) 4400 for (i = 0; i < pt->pt_argc; ++i)
4401 list_append_tv(rettv->vval.v_list, &pt->pt_argv[i]); 4401 list_append_tv(rettv->vval.v_list, &pt->pt_argv[i]);
4402 } 4402 }
4403 } 4403 }
4404 else 4404 else
4405 semsg(_(e_invarg2), what); 4405 semsg(_(e_invalid_argument_str), what);
4406 4406
4407 // When {what} == "dict" and pt->pt_dict == NULL, evaluate the 4407 // When {what} == "dict" and pt->pt_dict == NULL, evaluate the
4408 // third argument 4408 // third argument
4409 if (!what_is_dict) 4409 if (!what_is_dict)
4410 return; 4410 return;
4885 4885
4886 if (argvars[0].v_type != VAR_STRING 4886 if (argvars[0].v_type != VAR_STRING
4887 || argvars[0].vval.v_string == NULL 4887 || argvars[0].vval.v_string == NULL
4888 || *argvars[0].vval.v_string == NUL) 4888 || *argvars[0].vval.v_string == NUL)
4889 { 4889 {
4890 semsg(_(e_invarg2), tv_get_string(&argvars[0])); 4890 semsg(_(e_invalid_argument_str), tv_get_string(&argvars[0]));
4891 } 4891 }
4892 else 4892 else
4893 { 4893 {
4894 rettv->v_type = VAR_STRING; 4894 rettv->v_type = VAR_STRING;
4895 rettv->vval.v_string = vim_strsave( 4895 rettv->vval.v_string = vim_strsave(
6695 if (end != NULL && lv.ll_name != NULL) 6695 if (end != NULL && lv.ll_name != NULL)
6696 { 6696 {
6697 if (*end != NUL) 6697 if (*end != NUL)
6698 { 6698 {
6699 semsg(_(lv.ll_name == lv.ll_name_end 6699 semsg(_(lv.ll_name == lv.ll_name_end
6700 ? e_invarg2 : e_trailing_arg), end); 6700 ? e_invalid_argument_str : e_trailing_arg), end);
6701 } 6701 }
6702 else 6702 else
6703 { 6703 {
6704 if (lv.ll_tv == NULL) 6704 if (lv.ll_tv == NULL)
6705 { 6705 {
7758 rettv->v_type = VAR_NUMBER; 7758 rettv->v_type = VAR_NUMBER;
7759 rettv->vval.v_number = (varnumber_T)result; 7759 rettv->vval.v_number = (varnumber_T)result;
7760 return; 7760 return;
7761 7761
7762 theend: 7762 theend:
7763 semsg(_(e_invarg2), tv_get_string(&argvars[0])); 7763 semsg(_(e_invalid_argument_str), tv_get_string(&argvars[0]));
7764 rettv->v_type = VAR_NUMBER; 7764 rettv->v_type = VAR_NUMBER;
7765 rettv->vval.v_number = -1; 7765 rettv->vval.v_number = -1;
7766 } 7766 }
7767 7767
7768 /* 7768 /*
8083 case 's': mask = SP_SETPCMARK; break; 8083 case 's': mask = SP_SETPCMARK; break;
8084 case 'z': mask = SP_COLUMN; break; 8084 case 'z': mask = SP_COLUMN; break;
8085 } 8085 }
8086 if (mask == 0) 8086 if (mask == 0)
8087 { 8087 {
8088 semsg(_(e_invarg2), flags); 8088 semsg(_(e_invalid_argument_str), flags);
8089 dir = 0; 8089 dir = 0;
8090 } 8090 }
8091 else 8091 else
8092 *flagsp |= mask; 8092 *flagsp |= mask;
8093 } 8093 }
8173 * flags cannot be set. Check for that condition also. 8173 * flags cannot be set. Check for that condition also.
8174 */ 8174 */
8175 if (((flags & (SP_REPEAT | SP_RETCOUNT)) != 0) 8175 if (((flags & (SP_REPEAT | SP_RETCOUNT)) != 0)
8176 || ((flags & SP_NOMOVE) && (flags & SP_SETPCMARK))) 8176 || ((flags & SP_NOMOVE) && (flags & SP_SETPCMARK)))
8177 { 8177 {
8178 semsg(_(e_invarg2), tv_get_string(&argvars[1])); 8178 semsg(_(e_invalid_argument_str), tv_get_string(&argvars[1]));
8179 goto theend; 8179 goto theend;
8180 } 8180 }
8181 8181
8182 pos = save_cursor = curwin->w_cursor; 8182 pos = save_cursor = curwin->w_cursor;
8183 CLEAR_FIELD(firstpos); 8183 CLEAR_FIELD(firstpos);
8517 // Don't accept SP_END or SP_SUBPAT. 8517 // Don't accept SP_END or SP_SUBPAT.
8518 // Only one of the SP_NOMOVE or SP_SETPCMARK flags can be set. 8518 // Only one of the SP_NOMOVE or SP_SETPCMARK flags can be set.
8519 if ((flags & (SP_END | SP_SUBPAT)) != 0 8519 if ((flags & (SP_END | SP_SUBPAT)) != 0
8520 || ((flags & SP_NOMOVE) && (flags & SP_SETPCMARK))) 8520 || ((flags & SP_NOMOVE) && (flags & SP_SETPCMARK)))
8521 { 8521 {
8522 semsg(_(e_invarg2), tv_get_string(&argvars[3])); 8522 semsg(_(e_invalid_argument_str), tv_get_string(&argvars[3]));
8523 goto theend; 8523 goto theend;
8524 } 8524 }
8525 8525
8526 // Using 'r' implies 'W', otherwise it doesn't work. 8526 // Using 'r' implies 'W', otherwise it doesn't work.
8527 if (flags & SP_REPEAT) 8527 if (flags & SP_REPEAT)
8539 if (argvars[5].v_type != VAR_UNKNOWN) 8539 if (argvars[5].v_type != VAR_UNKNOWN)
8540 { 8540 {
8541 lnum_stop = (long)tv_get_number_chk(&argvars[5], NULL); 8541 lnum_stop = (long)tv_get_number_chk(&argvars[5], NULL);
8542 if (lnum_stop < 0) 8542 if (lnum_stop < 0)
8543 { 8543 {
8544 semsg(_(e_invarg2), tv_get_string(&argvars[5])); 8544 semsg(_(e_invalid_argument_str), tv_get_string(&argvars[5]));
8545 goto theend; 8545 goto theend;
8546 } 8546 }
8547 #ifdef FEAT_RELTIME 8547 #ifdef FEAT_RELTIME
8548 if (argvars[6].v_type != VAR_UNKNOWN) 8548 if (argvars[6].v_type != VAR_UNKNOWN)
8549 { 8549 {
8550 time_limit = (long)tv_get_number_chk(&argvars[6], NULL); 8550 time_limit = (long)tv_get_number_chk(&argvars[6], NULL);
8551 if (time_limit < 0) 8551 if (time_limit < 0)
8552 { 8552 {
8553 semsg(_(e_invarg2), tv_get_string(&argvars[6])); 8553 semsg(_(e_invalid_argument_str), tv_get_string(&argvars[6]));
8554 goto theend; 8554 goto theend;
8555 } 8555 }
8556 } 8556 }
8557 #endif 8557 #endif
8558 } 8558 }
8849 // set mark 8849 // set mark
8850 if (setmark_pos(name[1], &pos, fnum) == OK) 8850 if (setmark_pos(name[1], &pos, fnum) == OK)
8851 rettv->vval.v_number = 0; 8851 rettv->vval.v_number = 0;
8852 } 8852 }
8853 else 8853 else
8854 emsg(_(e_invarg)); 8854 emsg(_(e_invalid_argument));
8855 } 8855 }
8856 } 8856 }
8857 } 8857 }
8858 /* 8858 /*
8859 * "setcharpos()" function 8859 * "setcharpos()" function
8964 mode_str = tv_get_string_buf_chk(&argvars[1], modebuf); 8964 mode_str = tv_get_string_buf_chk(&argvars[1], modebuf);
8965 if (mode_str == NULL) 8965 if (mode_str == NULL)
8966 return; 8966 return;
8967 if (STRLEN(mode_str) != 9) 8967 if (STRLEN(mode_str) != 9)
8968 { 8968 {
8969 semsg(_(e_invarg2), mode_str); 8969 semsg(_(e_invalid_argument_str), mode_str);
8970 return; 8970 return;
8971 } 8971 }
8972 8972
8973 mask = 1; 8973 mask = 1;
8974 for (i = 8; i >= 0; --i) 8974 for (i = 8; i >= 0; --i)
9083 { 9083 {
9084 int ret = get_yank_type(&stropt, &yank_type, &block_len); 9084 int ret = get_yank_type(&stropt, &yank_type, &block_len);
9085 9085
9086 if (ret == FAIL || *++stropt != NUL) 9086 if (ret == FAIL || *++stropt != NUL)
9087 { 9087 {
9088 semsg(_(e_invargval), "value"); 9088 semsg(_(e_invalid_value_for_argument_str), "value");
9089 return; 9089 return;
9090 } 9090 }
9091 } 9091 }
9092 9092
9093 if (regname == '"') 9093 if (regname == '"')