mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-11 21:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

eval: Fix PVS/V547: skipping is now done using eval0

Browse Source
This commit is contained in:
ZyX
2018-04-15 18:50:02 +03:00
parent f8d574225b
commit 1df9ac1c03
1 changed files with 22 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/nvim/eval.c
View File

@@ -2684,17 +2684,19 @@ void ex_call(exarg_T *eap)
tofree = trans_function_name(&arg, eap->skip, TFN_INT, &fudi, &partial); tofree = trans_function_name(&arg, eap->skip, TFN_INT, &fudi, &partial);
if (fudi.fd_newkey != NULL) { if (fudi.fd_newkey != NULL) {
/* Still need to give an error message for missing key. */ // Still need to give an error message for missing key.
EMSG2(_(e_dictkey), fudi.fd_newkey); EMSG2(_(e_dictkey), fudi.fd_newkey);
xfree(fudi.fd_newkey); xfree(fudi.fd_newkey);
} }
if (tofree == NULL) if (tofree == NULL) {
return; return;
}
/* Increase refcount on dictionary, it could get deleted when evaluating // Increase refcount on dictionary, it could get deleted when evaluating
* the arguments. */ // the arguments.
if (fudi.fd_dict != NULL) if (fudi.fd_dict != NULL) {
++fudi.fd_dict->dv_refcount; fudi.fd_dict->dv_refcount++;
}
// If it is the name of a variable of type VAR_FUNC or VAR_PARTIAL use its // If it is the name of a variable of type VAR_FUNC or VAR_PARTIAL use its
// contents. For VAR_PARTIAL get its partial, unless we already have one // contents. For VAR_PARTIAL get its partial, unless we already have one
@@ -2703,8 +2705,8 @@ void ex_call(exarg_T *eap)
name = deref_func_name((const char *)tofree, &len, name = deref_func_name((const char *)tofree, &len,
partial != NULL ? NULL : &partial, false); partial != NULL ? NULL : &partial, false);
/* Skip white space to allow ":call func ()". Not good, but required for // Skip white space to allow ":call func ()". Not good, but required for
* backward compatibility. */ // backward compatibility.
startarg = skipwhite(arg); startarg = skipwhite(arg);
rettv.v_type = VAR_UNKNOWN; // tv_clear() uses this. rettv.v_type = VAR_UNKNOWN; // tv_clear() uses this.
@@ -2713,20 +2715,9 @@ void ex_call(exarg_T *eap)
goto end; goto end;
} }
/*
* When skipping, evaluate the function once, to find the end of the
* arguments.
* When the function takes a range, this is discovered after the first
* call, and the loop is broken.
*/
if (eap->skip) {
emsg_skip++;
lnum = eap->line2; // Do it once, also with an invalid range.
} else {
lnum = eap->line1; lnum = eap->line1;
}
for (; lnum <= eap->line2; lnum++) { for (; lnum <= eap->line2; lnum++) {
if (!eap->skip && eap->addr_count > 0) { // -V560 if (eap->addr_count > 0) { // -V560
curwin->w_cursor.lnum = lnum; curwin->w_cursor.lnum = lnum;
curwin->w_cursor.col = 0; curwin->w_cursor.col = 0;
curwin->w_cursor.coladd = 0; curwin->w_cursor.coladd = 0;
@@ -2747,28 +2738,28 @@ void ex_call(exarg_T *eap)
} }
tv_clear(&rettv); tv_clear(&rettv);
if (doesrange || eap->skip) { // -V560 if (doesrange) {
break; break;
} }
/* Stop when immediately aborting on error, or when an interrupt // Stop when immediately aborting on error, or when an interrupt
* occurred or an exception was thrown but not caught. // occurred or an exception was thrown but not caught.
* get_func_tv() returned OK, so that the check for trailing // get_func_tv() returned OK, so that the check for trailing
* characters below is executed. */ // characters below is executed.
if (aborting()) if (aborting()) {
break; break;
} }
if (eap->skip) }
--emsg_skip;
if (!failed) { if (!failed) {
/* Check for trailing illegal characters and a following command. */ // Check for trailing illegal characters and a following command.
if (!ends_excmd(*arg)) { if (!ends_excmd(*arg)) {
emsg_severe = TRUE; emsg_severe = TRUE;
EMSG(_(e_trailing)); EMSG(_(e_trailing));
} else } else {
eap->nextcmd = check_nextcmd(arg); eap->nextcmd = check_nextcmd(arg);
} }
}
end: end:
tv_dict_unref(fudi.fd_dict); tv_dict_unref(fudi.fd_dict);