mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-02 07:58:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Appease clint.

Browse Source
This commit is contained in:
Johan Klokkhammer Helsing
2015-11-22 00:24:49 +01:00
parent 238a8d33fa
commit b079622716
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/nvim/indent_c.c
View File

@@ -990,10 +990,7 @@ static int cin_isbreak(char_u *p)
* *
* This is a lot of guessing. Watch out for "cond ? func() : foo". * This is a lot of guessing. Watch out for "cond ? func() : foo".
*/ */
static int cin_is_cpp_baseclass ( static int cin_is_cpp_baseclass(cpp_baseclass_cache_T *cached) {
cpp_baseclass_cache_T *cached // input and output
)
{
lpos_T *pos = &cached->lpos; // find position lpos_T *pos = &cached->lpos; // find position
char_u *s; char_u *s;
int class_or_struct, lookfor_ctor_init, cpp_base_class; int class_or_struct, lookfor_ctor_init, cpp_base_class;
@@ -1071,8 +1068,8 @@ static int cin_is_cpp_baseclass (
} else if (lookfor_ctor_init || class_or_struct) { } else if (lookfor_ctor_init || class_or_struct) {
/* we have something found, that looks like the start of /* we have something found, that looks like the start of
* cpp-base-class-declaration or constructor-initialization */ * cpp-base-class-declaration or constructor-initialization */
cpp_base_class = TRUE; cpp_base_class = true;
lookfor_ctor_init = class_or_struct = FALSE; lookfor_ctor_init = class_or_struct = false;
pos->col = 0; pos->col = 0;
s = cin_skipcomment(s + 1); s = cin_skipcomment(s + 1);
} else } else
@@ -1099,8 +1096,8 @@ static int cin_is_cpp_baseclass (
return FALSE; return FALSE;
} else if (!vim_isIDc(s[0])) { } else if (!vim_isIDc(s[0])) {
/* if it is not an identifier, we are wrong */ /* if it is not an identifier, we are wrong */
class_or_struct = FALSE; class_or_struct = false;
lookfor_ctor_init = FALSE; lookfor_ctor_init = false;
} else if (pos->col == 0) { } else if (pos->col == 0) {
/* it can't be a constructor-initialization any more */ /* it can't be a constructor-initialization any more */
lookfor_ctor_init = FALSE; lookfor_ctor_init = FALSE;