mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-27 12:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

syntax: update types of stateitem_T members

Browse Source 
Replace 'short' with 'int16_t' to match lint changes from 8.0.1541.
Update ID_LIST_ALL to match type of stateitem_T.si_cont_list.
This commit is contained in:
Jan Edmund Lazo
2018-07-26 14:11:29 -04:00
parent 6f5eadcdac
commit 095ddcb548
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/nvim/syntax.c
View File

@@ -159,27 +159,27 @@ typedef struct syn_cluster_S {
* (The end positions have the column number of the next char) * (The end positions have the column number of the next char)
*/ */
typedef struct state_item { typedef struct state_item {
int si_idx; /* index of syntax pattern or int si_idx; // index of syntax pattern or
KEYWORD_IDX */ // KEYWORD_IDX
int si_id; /* highlight group ID for keywords */ int si_id; // highlight group ID for keywords
int si_trans_id; /* idem, transparency removed */ int si_trans_id; // idem, transparency removed
int si_m_lnum; /* lnum of the match */ int si_m_lnum; // lnum of the match
int si_m_startcol; /* starting column of the match */ int si_m_startcol; // starting column of the match
lpos_T si_m_endpos; /* just after end posn of the match */ lpos_T si_m_endpos; // just after end posn of the match
lpos_T si_h_startpos; /* start position of the highlighting */ lpos_T si_h_startpos; // start position of the highlighting
lpos_T si_h_endpos; /* end position of the highlighting */ lpos_T si_h_endpos; // end position of the highlighting
lpos_T si_eoe_pos; /* end position of end pattern */ lpos_T si_eoe_pos; // end position of end pattern
int si_end_idx; /* group ID for end pattern or zero */ int si_end_idx; // group ID for end pattern or zero
int si_ends; /* if match ends before si_m_endpos */ int si_ends; // if match ends before si_m_endpos
int si_attr; /* attributes in this state */ int si_attr; // attributes in this state
long si_flags; /* HL_HAS_EOL flag in this state, and long si_flags; // HL_HAS_EOL flag in this state, and
* HL_SKIP* for si_next_list */ // HL_SKIP* for si_next_list
int si_seqnr; /* sequence number */ int si_seqnr; // sequence number
int si_cchar; /* substitution character for conceal */ int si_cchar; // substitution character for conceal
short *si_cont_list; /* list of contained groups */ int16_t *si_cont_list; // list of contained groups
short *si_next_list; /* nextgroup IDs after this item ends */ int16_t *si_next_list; // nextgroup IDs after this item ends
reg_extmatch_T *si_extmatch; /* \z(...\) matches from start reg_extmatch_T *si_extmatch; // \z(...\) matches from start
* pattern */ // pattern
} stateitem_T; } stateitem_T;
/* /*
@@ -318,9 +318,10 @@ static int keepend_level = -1;
static char msg_no_items[] = N_("No Syntax items defined for this buffer"); static char msg_no_items[] = N_("No Syntax items defined for this buffer");
#define KEYWORD_IDX -1 /* value of si_idx for keywords */ // value of si_idx for keywords
#define ID_LIST_ALL (short *)-1 /* valid of si_cont_list for containing all #define KEYWORD_IDX -1
but contained groups */ // valid of si_cont_list for containing all but contained groups
#define ID_LIST_ALL (int16_t *)-1
static int next_seqnr = 1; /* value to use for si_seqnr */ static int next_seqnr = 1; /* value to use for si_seqnr */