diff options
author | Billy Su <g4691821@gmail.com> | 2019-03-04 09:47:13 +0800 |
---|---|---|
committer | Billy Su <g4691821@gmail.com> | 2019-03-08 00:08:16 +0800 |
commit | 96e2c3945f13453070894c70c74e4da29d421dab (patch) | |
tree | 87c8f2adcf21a3aa2092331e9902fd3133a6988d /src/nvim/regexp.c | |
parent | 0a471e009a1410a822384321dbd48a36b0117c5c (diff) | |
download | rneovim-96e2c3945f13453070894c70c74e4da29d421dab.tar.gz rneovim-96e2c3945f13453070894c70c74e4da29d421dab.tar.bz2 rneovim-96e2c3945f13453070894c70c74e4da29d421dab.zip |
lint: fix coding style
Diffstat (limited to 'src/nvim/regexp.c')
-rw-r--r-- | src/nvim/regexp.c | 48 |
1 files changed, 26 insertions, 22 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index dc3fbbaeb5..55490446e5 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -1210,27 +1210,30 @@ char_u *skip_regexp(char_u *startp, int dirc, int magic, char_u **newp) return p; } -/* - * Return TRUE if the back reference is legal. We must have seen the close - * brace. - * TODO: Should also check that we don't refer to something that is repeated - * (+*=): what instance of the repetition should we match? - */ +/// +/// Return TRUE if the back reference is legal. We must have seen the close +/// brace. +/// TODO(billy4195): Should also check that we don't refer to something that is +/// repeated +/// (+*=): what instance of the repetition should we match? +/// static int seen_endbrace(int refnum) { if (!had_endbrace[refnum]) { char_u *p; - /* Trick: check if "@<=" or "@<!" follows, in which case - * the \1 can appear before the referenced match. */ - for (p = regparse; *p != NUL; ++p) - if (p[0] == '@' && p[1] == '<' && (p[2] == '!' || p[2] == '=')) + // Trick: check if "@<=" or "@<!" follows, in which case + // the \1 can appear before the referenced match. + for (p = regparse; *p != NUL; p++) { + if (p[0] == '@' && p[1] == '<' && (p[2] == '!' || p[2] == '=')) { break; + } + } if (*p == NUL) { EMSG(_("E65: Illegal back reference")); - rc_did_emsg = TRUE; - return FALSE; + rc_did_emsg = true; + return false; } } return TRUE; @@ -1953,8 +1956,9 @@ static char_u *regatom(int *flagp) int refnum; refnum = c - Magic('0'); - if (!seen_endbrace(refnum)) + if (!seen_endbrace(refnum)) { return NULL; + } ret = regnode(BACKREF + refnum); } break; @@ -3783,17 +3787,17 @@ regmatch( int c; regitem_T *rp; int no; - int status; /* one of the RA_ values: */ - int tm_count; /* counter for checking timeout */ -#define RA_FAIL 1 /* something failed, abort */ -#define RA_CONT 2 /* continue in inner loop */ -#define RA_BREAK 3 /* break inner loop */ -#define RA_MATCH 4 /* successful match */ -#define RA_NOMATCH 5 /* didn't match */ + int status; // one of the RA_ values: + int tm_count; // counter for checking timeout +#define RA_FAIL 1 // something failed, abort +#define RA_CONT 2 // continue in inner loop +#define RA_BREAK 3 // break inner loop +#define RA_MATCH 4 // successful match +#define RA_NOMATCH 5 // didn't match tm_count = 0; - /* Make "regstack" and "backpos" empty. They are allocated and freed in - * bt_regexec_both() to reduce malloc()/free() calls. */ + // Make "regstack" and "backpos" empty. They are allocated and freed in + // bt_regexec_both() to reduce malloc()/free() calls. regstack.ga_len = 0; backpos.ga_len = 0; |