Extract pos.h from structs.h

This will make it much simpler to move the other types in structs.h
which depend on `pos_T` and `lpos_T`.
This commit is contained in:
Felipe Oliveira Carvalho
2014-03-08 17:32:02 -03:00
committed by Thiago de Arruda
parent b33096127c
commit bd9cd693e7
3 changed files with 28 additions and 20 deletions

23
src/pos.h Normal file
View File

@@ -0,0 +1,23 @@
#ifndef NEOVIM_POS_H
#define NEOVIM_POS_H
/*
* position in file or buffer
*/
typedef struct {
linenr_T lnum; /* line number */
colnr_T col; /* column number */
colnr_T coladd;
} pos_T;
# define INIT_POS_T(l, c, ca) {l, c, ca}
/*
* Same, but without coladd.
*/
typedef struct {
linenr_T lnum; /* line number */
colnr_T col; /* column number */
} lpos_T;
#endif /* NEOVIM_POS_H */

View File

@@ -13,6 +13,8 @@
#ifndef _REGEXP_H #ifndef _REGEXP_H
#define _REGEXP_H #define _REGEXP_H
#include "pos.h"
/* /*
* The number of sub-matches is limited to 10. * The number of sub-matches is limited to 10.
* The first one (index 0) is the whole match, referenced with "\0". * The first one (index 0) is the whole match, referenced with "\0".

View File

@@ -8,30 +8,13 @@
// for garray_T // for garray_T
#include "garray.h" #include "garray.h"
// for pos_T and lpos_T
#include "pos.h"
/* /*
* This file contains various definitions of structures that are used by Vim * This file contains various definitions of structures that are used by Vim
*/ */
/*
* position in file or buffer
*/
typedef struct {
linenr_T lnum; /* line number */
colnr_T col; /* column number */
colnr_T coladd;
} pos_T;
# define INIT_POS_T(l, c, ca) {l, c, ca}
/*
* Same, but without coladd.
*/
typedef struct {
linenr_T lnum; /* line number */
colnr_T col; /* column number */
} lpos_T;
typedef struct window_S win_T; typedef struct window_S win_T;
typedef struct wininfo_S wininfo_T; typedef struct wininfo_S wininfo_T;
typedef struct frame_S frame_T; typedef struct frame_S frame_T;
@@ -39,7 +22,7 @@ typedef int scid_T; /* script ID */
typedef struct file_buffer buf_T; /* forward declaration */ typedef struct file_buffer buf_T; /* forward declaration */
/* /*
* This is here because regexp_defs.h needs pos_T and below regprog_T is used. * This is here because regexp_defs.h needs win_T and regprog_T is used below.
*/ */
#include "regexp_defs.h" #include "regexp_defs.h"