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

refactor/single-include: regexp_defs.h

Browse Source
This commit is contained in:
relnod 2017-07-15 16:44:06 +02:00
parent 295c90989d
commit 69199958b7
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/CMakeLists.txt
View File

@ -541,7 +541,6 @@ endfunction()
set(NO_SINGLE_CHECK_HEADERS set(NO_SINGLE_CHECK_HEADERS
os/win_defs.h os/win_defs.h
os/pty_process_win.h os/pty_process_win.h
regexp_defs.h
syntax_defs.h syntax_defs.h
undo.h undo.h
undo_defs.h undo_defs.h

46
src/nvim/regexp_defs.h
View File

@ -15,6 +15,8 @@
#include <stdbool.h> #include <stdbool.h>
#include "nvim/pos.h" #include "nvim/pos.h"
#include "nvim/types.h"
#include "nvim/profile.h"
/* /*
* The number of sub-matches is limited to 10. * The number of sub-matches is limited to 10.
@ -41,18 +43,38 @@
#define NFA_ENGINE 2 #define NFA_ENGINE 2
typedef struct regengine regengine_T; typedef struct regengine regengine_T;
typedef struct regprog regprog_T;
typedef struct reg_extmatch reg_extmatch_T;
/*
* Structure to be used for multi-line matching.
* Sub-match "no" starts in line "startpos[no].lnum" column "startpos[no].col"
* and ends in line "endpos[no].lnum" just before column "endpos[no].col".
* The line numbers are relative to the first line, thus startpos[0].lnum is
* always 0.
* When there is no match, the line number is -1.
*/
typedef struct {
regprog_T *regprog;
lpos_T startpos[NSUBEXP];
lpos_T endpos[NSUBEXP];
int rmm_ic;
colnr_T rmm_maxcol; /* when not zero: maximum column */
} regmmatch_T;
#include "nvim/buffer_defs.h"
/* /*
* Structure returned by vim_regcomp() to pass on to vim_regexec(). * Structure returned by vim_regcomp() to pass on to vim_regexec().
* This is the general structure. For the actual matcher, two specific * This is the general structure. For the actual matcher, two specific
* structures are used. See code below. * structures are used. See code below.
*/ */
typedef struct regprog { struct regprog {
regengine_T *engine; regengine_T *engine;
unsigned regflags; unsigned regflags;
unsigned re_engine; ///< Automatic, backtracking or NFA engine. unsigned re_engine; ///< Automatic, backtracking or NFA engine.
unsigned re_flags; ///< Second argument for vim_regcomp(). unsigned re_flags; ///< Second argument for vim_regcomp().
} regprog_T; };
/* /*
* Structure used by the back track matcher. * Structure used by the back track matcher.
@ -125,31 +147,15 @@ typedef struct {
bool rm_ic; bool rm_ic;
} regmatch_T; } regmatch_T;
/*
* Structure to be used for multi-line matching.
* Sub-match "no" starts in line "startpos[no].lnum" column "startpos[no].col"
* and ends in line "endpos[no].lnum" just before column "endpos[no].col".
* The line numbers are relative to the first line, thus startpos[0].lnum is
* always 0.
* When there is no match, the line number is -1.
*/
typedef struct {
regprog_T *regprog;
lpos_T startpos[NSUBEXP];
lpos_T endpos[NSUBEXP];
int rmm_ic;
colnr_T rmm_maxcol; /* when not zero: maximum column */
} regmmatch_T;
/* /*
* Structure used to store external references: "\z\(\)" to "\z\1". * Structure used to store external references: "\z\(\)" to "\z\1".
* Use a reference count to avoid the need to copy this around. When it goes * Use a reference count to avoid the need to copy this around. When it goes
* from 1 to zero the matches need to be freed. * from 1 to zero the matches need to be freed.
*/ */
typedef struct { struct reg_extmatch {
short refcnt; short refcnt;
char_u *matches[NSUBEXP]; char_u *matches[NSUBEXP];
} reg_extmatch_T; };
struct regengine { struct regengine {
regprog_T *(*regcomp)(char_u*, int); regprog_T *(*regcomp)(char_u*, int);