From 9b34b867ddc4c9e458bc108fb14de33ab6c4ee75 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 26 Jul 2018 11:46:59 -0400 Subject: syntax: update types for keyentry_T,sp_syn Replace 'short' with 'int16_t' --- src/nvim/syntax_defs.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/nvim/syntax_defs.h') diff --git a/src/nvim/syntax_defs.h b/src/nvim/syntax_defs.h index 63089a62af..18518a6b4c 100644 --- a/src/nvim/syntax_defs.h +++ b/src/nvim/syntax_defs.h @@ -18,9 +18,9 @@ typedef unsigned short disptick_T; /* display tick type */ /* struct passed to in_id_list() */ struct sp_syn { - int inc_tag; /* ":syn include" unique tag */ - short id; /* highlight group ID of item */ - short *cont_in_list; /* cont.in group IDs, if non-zero */ + int inc_tag; // ":syn include" unique tag + int16_t id; // highlight group ID of item + int16_t *cont_in_list; // cont.in group IDs, if non-zero }; /* @@ -29,12 +29,12 @@ struct sp_syn { typedef struct keyentry keyentry_T; struct keyentry { - keyentry_T *ke_next; /* next entry with identical "keyword[]" */ - struct sp_syn k_syn; /* struct passed to in_id_list() */ - short *next_list; /* ID list for next match (if non-zero) */ + keyentry_T *ke_next; // next entry with identical "keyword[]" + struct sp_syn k_syn; // struct passed to in_id_list() + int16_t *next_list; // ID list for next match (if non-zero) int flags; - int k_char; /* conceal substitute character */ - char_u keyword[1]; /* actually longer */ + int k_char; // conceal substitute character + char_u keyword[1]; // actually longer }; /* -- cgit From 2a7047b77cc5814fcd2d3107e4cfe2a56ad1b7c8 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 26 Jul 2018 16:40:05 -0400 Subject: syntax: syn_state.sst_next_list is int16_t* --- src/nvim/syntax_defs.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/nvim/syntax_defs.h') diff --git a/src/nvim/syntax_defs.h b/src/nvim/syntax_defs.h index 18518a6b4c..71ebd8b2f0 100644 --- a/src/nvim/syntax_defs.h +++ b/src/nvim/syntax_defs.h @@ -59,13 +59,13 @@ struct syn_state { bufstate_T sst_stack[SST_FIX_STATES]; /* short state stack */ garray_T sst_ga; /* growarray for long state stack */ } sst_union; - int sst_next_flags; /* flags for sst_next_list */ - int sst_stacksize; /* number of states on the stack */ - short *sst_next_list; /* "nextgroup" list in this state - * (this is a copy, don't free it! */ - disptick_T sst_tick; /* tick when last displayed */ - linenr_T sst_change_lnum; /* when non-zero, change in this line - * may have made the state invalid */ + int sst_next_flags; // flags for sst_next_list + int sst_stacksize; // number of states on the stack + int16_t *sst_next_list; // "nextgroup" list in this state + // (this is a copy, don't free it! + disptick_T sst_tick; // tick when last displayed + linenr_T sst_change_lnum; // when non-zero, change in this line + // may have made the state invalid }; #endif // NVIM_SYNTAX_DEFS_H -- cgit From d3f609db05e1b77e190768da29fcc86039b9cd54 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sun, 29 Jul 2018 17:51:10 -0400 Subject: syntax: disptick_T is uint16_t --- src/nvim/syntax_defs.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/nvim/syntax_defs.h') diff --git a/src/nvim/syntax_defs.h b/src/nvim/syntax_defs.h index 71ebd8b2f0..5ee0611d58 100644 --- a/src/nvim/syntax_defs.h +++ b/src/nvim/syntax_defs.h @@ -14,8 +14,6 @@ typedef struct syn_state synstate_T; #include "nvim/buffer_defs.h" #include "nvim/regexp_defs.h" -typedef unsigned short disptick_T; /* display tick type */ - /* struct passed to in_id_list() */ struct sp_syn { int inc_tag; // ":syn include" unique tag -- cgit