diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2019-07-25 12:00:08 +0200 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2019-07-25 12:00:08 +0200 |
commit | 36622014c640ad5df19269e63ad037c104efce9c (patch) | |
tree | 3f5cde7423587bd69dcdb2b5b326580129e4ef68 /src/nvim/regexp.c | |
parent | d1faf900b1c682c0d5c20854fcd8d6d02a12200c (diff) | |
parent | 0925afcfcfd3fb024a35d10ee8f584b67bdc9000 (diff) | |
download | rneovim-36622014c640ad5df19269e63ad037c104efce9c.tar.gz rneovim-36622014c640ad5df19269e63ad037c104efce9c.tar.bz2 rneovim-36622014c640ad5df19269e63ad037c104efce9c.zip |
Merge #10596 'vim-patch:8.1.{899,903,905,907,908,910,913,1746}'
close #9930
close #10051
Diffstat (limited to 'src/nvim/regexp.c')
-rw-r--r-- | src/nvim/regexp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c index eb1e565b1f..414472a8f3 100644 --- a/src/nvim/regexp.c +++ b/src/nvim/regexp.c @@ -247,9 +247,9 @@ #define BRACE_COMPLEX 140 /* -149 node Match nodes between m & n times */ -#define NOPEN 150 /* Mark this point in input as start of - \%( subexpr. */ -#define NCLOSE 151 /* Analogous to NOPEN. */ +#define NOPEN 150 // Mark this point in input as start of + // \%( subexpr. +#define NCLOSE 151 // Analogous to NOPEN. #define MULTIBYTECODE 200 /* mbc Match one multi-byte character */ #define RE_BOF 201 /* Match "" at beginning of file. */ @@ -348,13 +348,13 @@ typedef enum regstate_E { * more things. */ typedef struct regitem_S { - regstate_T rs_state; /* what we are doing, one of RS_ above */ - char_u *rs_scan; /* current node in program */ + regstate_T rs_state; // what we are doing, one of RS_ above + uint16_t rs_no; // submatch nr or BEHIND/NOBEHIND + char_u *rs_scan; // current node in program union { save_se_T sesave; regsave_T regsave; - } rs_un; /* room for saving reginput */ - short rs_no; /* submatch nr or BEHIND/NOBEHIND */ + } rs_un; // room for saving reginput } regitem_T; |