IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

syntax: Silence PVS/V560: condition is always true at that point

Browse Source
This commit is contained in:
ZyX 2018-04-22 20:12:23 +03:00
parent 2a951d16a4
commit e724667ef4
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/nvim/syntax.c
View File

@ -4549,20 +4549,21 @@ syn_cmd_region (
++key_end; ++key_end;
xfree(key); xfree(key);
key = vim_strnsave_up(rest, (int)(key_end - rest)); key = vim_strnsave_up(rest, (int)(key_end - rest));
if (STRCMP(key, "MATCHGROUP") == 0) if (STRCMP(key, "MATCHGROUP") == 0) {
item = ITEM_MATCHGROUP; item = ITEM_MATCHGROUP;
else if (STRCMP(key, "START") == 0) } else if (STRCMP(key, "START") == 0) {
item = ITEM_START; item = ITEM_START;
else if (STRCMP(key, "END") == 0) } else if (STRCMP(key, "END") == 0) {
item = ITEM_END; item = ITEM_END;
else if (STRCMP(key, "SKIP") == 0) { } else if (STRCMP(key, "SKIP") == 0) {
if (pat_ptrs[ITEM_SKIP] != NULL) { /* one skip pattern allowed */ if (pat_ptrs[ITEM_SKIP] != NULL) { // One skip pattern allowed.
illegal = TRUE; illegal = TRUE;
break; break;
} }
item = ITEM_SKIP; item = ITEM_SKIP;
} else } else {
break; break;
}
rest = skipwhite(key_end); rest = skipwhite(key_end);
if (*rest != '=') { if (*rest != '=') {
rest = NULL; rest = NULL;
@ -4598,21 +4599,23 @@ syn_cmd_region (
pat_ptrs[item] = ppp; pat_ptrs[item] = ppp;
ppp->pp_synp = xcalloc(1, sizeof(synpat_T)); ppp->pp_synp = xcalloc(1, sizeof(synpat_T));
/* // Get the syntax pattern and the following offset(s).
* Get the syntax pattern and the following offset(s).
*/ // Enable the appropriate \z specials.
/* Enable the appropriate \z specials. */ if (item == ITEM_START) {
if (item == ITEM_START)
reg_do_extmatch = REX_SET; reg_do_extmatch = REX_SET;
else if (item == ITEM_SKIP || item == ITEM_END) } else {
assert(item == ITEM_SKIP || item == ITEM_END);
reg_do_extmatch = REX_USE; reg_do_extmatch = REX_USE;
}
rest = get_syn_pattern(rest, ppp->pp_synp); rest = get_syn_pattern(rest, ppp->pp_synp);
reg_do_extmatch = 0; reg_do_extmatch = 0;
if (item == ITEM_END && vim_regcomp_had_eol() if (item == ITEM_END && vim_regcomp_had_eol()
&& !(syn_opt_arg.flags & HL_EXCLUDENL)) && !(syn_opt_arg.flags & HL_EXCLUDENL)) {
ppp->pp_synp->sp_flags |= HL_HAS_EOL; ppp->pp_synp->sp_flags |= HL_HAS_EOL;
}
ppp->pp_matchgroup_id = matchgroup_id; ppp->pp_matchgroup_id = matchgroup_id;
++pat_count; pat_count++;
} }
} }
xfree(key); xfree(key);