mirror of
https://github.com/neovim/neovim.git
synced 2025-09-27 05:28:33 +00:00
Remove __ARGS macro. Close #205
This is a squash of all commits sent to #81. - Remove unused undef of __ARGS. - Fix mch_rename declaration. - Follow changes related to moved & extracted files. - Properly indent function declarations of getchar.h and quickfix.c.
This commit is contained in:
Nicolas Pierron
committed by
Thiago de Arruda
Thiago de Arruda
parent
2bd6d44403
commit
d9283c4927
237
src/syntax.c
237
src/syntax.c
@@ -90,17 +90,17 @@ static int hl_attr_table[] =
|
||||
{HL_BOLD, HL_STANDOUT, HL_UNDERLINE, HL_UNDERCURL, HL_ITALIC, HL_INVERSE,
|
||||
HL_INVERSE, 0};
|
||||
|
||||
static int get_attr_entry __ARGS((garray_T *table, attrentry_T *aep));
|
||||
static void syn_unadd_group __ARGS((void));
|
||||
static void set_hl_attr __ARGS((int idx));
|
||||
static void highlight_list_one __ARGS((int id));
|
||||
static int highlight_list_arg __ARGS((int id, int didh, int type, int iarg,
|
||||
char_u *sarg,
|
||||
char *name));
|
||||
static int syn_add_group __ARGS((char_u *name));
|
||||
static int syn_list_header __ARGS((int did_header, int outlen, int id));
|
||||
static int hl_has_settings __ARGS((int idx, int check_link));
|
||||
static void highlight_clear __ARGS((int idx));
|
||||
static int get_attr_entry(garray_T *table, attrentry_T *aep);
|
||||
static void syn_unadd_group(void);
|
||||
static void set_hl_attr(int idx);
|
||||
static void highlight_list_one(int id);
|
||||
static int highlight_list_arg(int id, int didh, int type, int iarg,
|
||||
char_u *sarg,
|
||||
char *name);
|
||||
static int syn_add_group(char_u *name);
|
||||
static int syn_list_header(int did_header, int outlen, int id);
|
||||
static int hl_has_settings(int idx, int check_link);
|
||||
static void highlight_clear(int idx);
|
||||
|
||||
|
||||
/*
|
||||
@@ -353,114 +353,113 @@ static int current_line_id = 0; /* unique number for current line */
|
||||
|
||||
#define CUR_STATE(idx) ((stateitem_T *)(current_state.ga_data))[idx]
|
||||
|
||||
static void syn_sync __ARGS((win_T *wp, linenr_T lnum, synstate_T *last_valid));
|
||||
static int syn_match_linecont __ARGS((linenr_T lnum));
|
||||
static void syn_start_line __ARGS((void));
|
||||
static void syn_update_ends __ARGS((int startofline));
|
||||
static void syn_stack_alloc __ARGS((void));
|
||||
static int syn_stack_cleanup __ARGS((void));
|
||||
static void syn_stack_free_entry __ARGS((synblock_T *block, synstate_T *p));
|
||||
static synstate_T *syn_stack_find_entry __ARGS((linenr_T lnum));
|
||||
static synstate_T *store_current_state __ARGS((void));
|
||||
static void load_current_state __ARGS((synstate_T *from));
|
||||
static void invalidate_current_state __ARGS((void));
|
||||
static int syn_stack_equal __ARGS((synstate_T *sp));
|
||||
static void validate_current_state __ARGS((void));
|
||||
static int syn_finish_line __ARGS((int syncing));
|
||||
static int syn_current_attr __ARGS((int syncing, int displaying, int *can_spell,
|
||||
int keep_state));
|
||||
static int did_match_already __ARGS((int idx, garray_T *gap));
|
||||
static stateitem_T *push_next_match __ARGS((stateitem_T *cur_si));
|
||||
static void check_state_ends __ARGS((void));
|
||||
static void update_si_attr __ARGS((int idx));
|
||||
static void check_keepend __ARGS((void));
|
||||
static void update_si_end __ARGS((stateitem_T *sip, int startcol, int force));
|
||||
static short *copy_id_list __ARGS((short *list));
|
||||
static int in_id_list __ARGS((stateitem_T *item, short *cont_list,
|
||||
struct sp_syn *ssp,
|
||||
int contained));
|
||||
static int push_current_state __ARGS((int idx));
|
||||
static void pop_current_state __ARGS((void));
|
||||
static void syn_clear_time __ARGS((syn_time_T *tt));
|
||||
static void syntime_clear __ARGS((void));
|
||||
static int syn_compare_syntime __ARGS((const void *v1, const void *v2));
|
||||
static void syntime_report __ARGS((void));
|
||||
static void syn_sync(win_T *wp, linenr_T lnum, synstate_T *last_valid);
|
||||
static int syn_match_linecont(linenr_T lnum);
|
||||
static void syn_start_line(void);
|
||||
static void syn_update_ends(int startofline);
|
||||
static void syn_stack_alloc(void);
|
||||
static int syn_stack_cleanup(void);
|
||||
static void syn_stack_free_entry(synblock_T *block, synstate_T *p);
|
||||
static synstate_T *syn_stack_find_entry(linenr_T lnum);
|
||||
static synstate_T *store_current_state(void);
|
||||
static void load_current_state(synstate_T *from);
|
||||
static void invalidate_current_state(void);
|
||||
static int syn_stack_equal(synstate_T *sp);
|
||||
static void validate_current_state(void);
|
||||
static int syn_finish_line(int syncing);
|
||||
static int syn_current_attr(int syncing, int displaying, int *can_spell,
|
||||
int keep_state);
|
||||
static int did_match_already(int idx, garray_T *gap);
|
||||
static stateitem_T *push_next_match(stateitem_T *cur_si);
|
||||
static void check_state_ends(void);
|
||||
static void update_si_attr(int idx);
|
||||
static void check_keepend(void);
|
||||
static void update_si_end(stateitem_T *sip, int startcol, int force);
|
||||
static short *copy_id_list(short *list);
|
||||
static int in_id_list(stateitem_T *item, short *cont_list,
|
||||
struct sp_syn *ssp,
|
||||
int contained);
|
||||
static int push_current_state(int idx);
|
||||
static void pop_current_state(void);
|
||||
static void syn_clear_time(syn_time_T *tt);
|
||||
static void syntime_clear(void);
|
||||
static int syn_compare_syntime(const void *v1, const void *v2);
|
||||
static void syntime_report(void);
|
||||
static int syn_time_on = FALSE;
|
||||
# define IF_SYN_TIME(p) (p)
|
||||
|
||||
static void syn_stack_apply_changes_block __ARGS((synblock_T *block, buf_T *buf));
|
||||
static void find_endpos __ARGS((int idx, lpos_T *startpos, lpos_T *m_endpos,
|
||||
lpos_T *hl_endpos, long *flagsp, lpos_T *
|
||||
end_endpos, int *end_idx,
|
||||
reg_extmatch_T *start_ext));
|
||||
static void clear_syn_state __ARGS((synstate_T *p));
|
||||
static void clear_current_state __ARGS((void));
|
||||
static void syn_stack_apply_changes_block(synblock_T *block, buf_T *buf);
|
||||
static void find_endpos(int idx, lpos_T *startpos, lpos_T *m_endpos,
|
||||
lpos_T *hl_endpos, long *flagsp, lpos_T *end_endpos,
|
||||
int *end_idx, reg_extmatch_T *start_ext);
|
||||
static void clear_syn_state(synstate_T *p);
|
||||
static void clear_current_state(void);
|
||||
|
||||
static void limit_pos __ARGS((lpos_T *pos, lpos_T *limit));
|
||||
static void limit_pos_zero __ARGS((lpos_T *pos, lpos_T *limit));
|
||||
static void syn_add_end_off __ARGS((lpos_T *result, regmmatch_T *regmatch,
|
||||
synpat_T *spp, int idx,
|
||||
int extra));
|
||||
static void syn_add_start_off __ARGS((lpos_T *result, regmmatch_T *regmatch,
|
||||
synpat_T *spp, int idx,
|
||||
int extra));
|
||||
static char_u *syn_getcurline __ARGS((void));
|
||||
static int syn_regexec __ARGS((regmmatch_T *rmp, linenr_T lnum, colnr_T col,
|
||||
syn_time_T *st));
|
||||
static int check_keyword_id __ARGS((char_u *line, int startcol, int *endcol,
|
||||
long *flags, short **next_list,
|
||||
stateitem_T *cur_si,
|
||||
int *ccharp));
|
||||
static void syn_cmd_case __ARGS((exarg_T *eap, int syncing));
|
||||
static void syn_cmd_spell __ARGS((exarg_T *eap, int syncing));
|
||||
static void syntax_sync_clear __ARGS((void));
|
||||
static void syn_remove_pattern __ARGS((synblock_T *block, int idx));
|
||||
static void syn_clear_pattern __ARGS((synblock_T *block, int i));
|
||||
static void syn_clear_cluster __ARGS((synblock_T *block, int i));
|
||||
static void syn_cmd_clear __ARGS((exarg_T *eap, int syncing));
|
||||
static void syn_cmd_conceal __ARGS((exarg_T *eap, int syncing));
|
||||
static void syn_clear_one __ARGS((int id, int syncing));
|
||||
static void syn_cmd_on __ARGS((exarg_T *eap, int syncing));
|
||||
static void syn_cmd_enable __ARGS((exarg_T *eap, int syncing));
|
||||
static void syn_cmd_reset __ARGS((exarg_T *eap, int syncing));
|
||||
static void syn_cmd_manual __ARGS((exarg_T *eap, int syncing));
|
||||
static void syn_cmd_off __ARGS((exarg_T *eap, int syncing));
|
||||
static void syn_cmd_onoff __ARGS((exarg_T *eap, char *name));
|
||||
static void syn_cmd_list __ARGS((exarg_T *eap, int syncing));
|
||||
static void syn_lines_msg __ARGS((void));
|
||||
static void syn_match_msg __ARGS((void));
|
||||
static void syn_stack_free_block __ARGS((synblock_T *block));
|
||||
static void syn_list_one __ARGS((int id, int syncing, int link_only));
|
||||
static void syn_list_cluster __ARGS((int id));
|
||||
static void put_id_list __ARGS((char_u *name, short *list, int attr));
|
||||
static void put_pattern __ARGS((char *s, int c, synpat_T *spp, int attr));
|
||||
static int syn_list_keywords __ARGS((int id, hashtab_T *ht, int did_header,
|
||||
int attr));
|
||||
static void syn_clear_keyword __ARGS((int id, hashtab_T *ht));
|
||||
static void clear_keywtab __ARGS((hashtab_T *ht));
|
||||
static void add_keyword __ARGS((char_u *name, int id, int flags,
|
||||
short *cont_in_list, short *next_list,
|
||||
int conceal_char));
|
||||
static char_u *get_group_name __ARGS((char_u *arg, char_u **name_end));
|
||||
static char_u *get_syn_options __ARGS((char_u *arg, syn_opt_arg_T *opt,
|
||||
int *conceal_char));
|
||||
static void syn_cmd_include __ARGS((exarg_T *eap, int syncing));
|
||||
static void syn_cmd_keyword __ARGS((exarg_T *eap, int syncing));
|
||||
static void syn_cmd_match __ARGS((exarg_T *eap, int syncing));
|
||||
static void syn_cmd_region __ARGS((exarg_T *eap, int syncing));
|
||||
static int syn_compare_stub __ARGS((const void *v1, const void *v2));
|
||||
static void syn_cmd_cluster __ARGS((exarg_T *eap, int syncing));
|
||||
static int syn_scl_name2id __ARGS((char_u *name));
|
||||
static int syn_scl_namen2id __ARGS((char_u *linep, int len));
|
||||
static int syn_check_cluster __ARGS((char_u *pp, int len));
|
||||
static int syn_add_cluster __ARGS((char_u *name));
|
||||
static void init_syn_patterns __ARGS((void));
|
||||
static char_u *get_syn_pattern __ARGS((char_u *arg, synpat_T *ci));
|
||||
static void syn_cmd_sync __ARGS((exarg_T *eap, int syncing));
|
||||
static int get_id_list __ARGS((char_u **arg, int keylen, short **list));
|
||||
static void syn_combine_list __ARGS((short **clstr1, short **clstr2,
|
||||
int list_op));
|
||||
static void syn_incl_toplevel __ARGS((int id, int *flagsp));
|
||||
static void limit_pos(lpos_T *pos, lpos_T *limit);
|
||||
static void limit_pos_zero(lpos_T *pos, lpos_T *limit);
|
||||
static void syn_add_end_off(lpos_T *result, regmmatch_T *regmatch,
|
||||
synpat_T *spp, int idx,
|
||||
int extra);
|
||||
static void syn_add_start_off(lpos_T *result, regmmatch_T *regmatch,
|
||||
synpat_T *spp, int idx,
|
||||
int extra);
|
||||
static char_u *syn_getcurline(void);
|
||||
static int syn_regexec(regmmatch_T *rmp, linenr_T lnum, colnr_T col,
|
||||
syn_time_T *st);
|
||||
static int check_keyword_id(char_u *line, int startcol, int *endcol,
|
||||
long *flags, short **next_list,
|
||||
stateitem_T *cur_si,
|
||||
int *ccharp);
|
||||
static void syn_cmd_case(exarg_T *eap, int syncing);
|
||||
static void syn_cmd_spell(exarg_T *eap, int syncing);
|
||||
static void syntax_sync_clear(void);
|
||||
static void syn_remove_pattern(synblock_T *block, int idx);
|
||||
static void syn_clear_pattern(synblock_T *block, int i);
|
||||
static void syn_clear_cluster(synblock_T *block, int i);
|
||||
static void syn_cmd_clear(exarg_T *eap, int syncing);
|
||||
static void syn_cmd_conceal(exarg_T *eap, int syncing);
|
||||
static void syn_clear_one(int id, int syncing);
|
||||
static void syn_cmd_on(exarg_T *eap, int syncing);
|
||||
static void syn_cmd_enable(exarg_T *eap, int syncing);
|
||||
static void syn_cmd_reset(exarg_T *eap, int syncing);
|
||||
static void syn_cmd_manual(exarg_T *eap, int syncing);
|
||||
static void syn_cmd_off(exarg_T *eap, int syncing);
|
||||
static void syn_cmd_onoff(exarg_T *eap, char *name);
|
||||
static void syn_cmd_list(exarg_T *eap, int syncing);
|
||||
static void syn_lines_msg(void);
|
||||
static void syn_match_msg(void);
|
||||
static void syn_stack_free_block(synblock_T *block);
|
||||
static void syn_list_one(int id, int syncing, int link_only);
|
||||
static void syn_list_cluster(int id);
|
||||
static void put_id_list(char_u *name, short *list, int attr);
|
||||
static void put_pattern(char *s, int c, synpat_T *spp, int attr);
|
||||
static int syn_list_keywords(int id, hashtab_T *ht, int did_header,
|
||||
int attr);
|
||||
static void syn_clear_keyword(int id, hashtab_T *ht);
|
||||
static void clear_keywtab(hashtab_T *ht);
|
||||
static void add_keyword(char_u *name, int id, int flags,
|
||||
short *cont_in_list, short *next_list,
|
||||
int conceal_char);
|
||||
static char_u *get_group_name(char_u *arg, char_u **name_end);
|
||||
static char_u *get_syn_options(char_u *arg, syn_opt_arg_T *opt,
|
||||
int *conceal_char);
|
||||
static void syn_cmd_include(exarg_T *eap, int syncing);
|
||||
static void syn_cmd_keyword(exarg_T *eap, int syncing);
|
||||
static void syn_cmd_match(exarg_T *eap, int syncing);
|
||||
static void syn_cmd_region(exarg_T *eap, int syncing);
|
||||
static int syn_compare_stub(const void *v1, const void *v2);
|
||||
static void syn_cmd_cluster(exarg_T *eap, int syncing);
|
||||
static int syn_scl_name2id(char_u *name);
|
||||
static int syn_scl_namen2id(char_u *linep, int len);
|
||||
static int syn_check_cluster(char_u *pp, int len);
|
||||
static int syn_add_cluster(char_u *name);
|
||||
static void init_syn_patterns(void);
|
||||
static char_u *get_syn_pattern(char_u *arg, synpat_T *ci);
|
||||
static void syn_cmd_sync(exarg_T *eap, int syncing);
|
||||
static int get_id_list(char_u **arg, int keylen, short **list);
|
||||
static void syn_combine_list(short **clstr1, short **clstr2,
|
||||
int list_op);
|
||||
static void syn_incl_toplevel(int id, int *flagsp);
|
||||
|
||||
/*
|
||||
* Start the syntax recognition for a line. This function is normally called
|
||||
@@ -3503,7 +3502,7 @@ struct name_list {
|
||||
char *name;
|
||||
};
|
||||
|
||||
static void syn_list_flags __ARGS((struct name_list *nl, int flags, int attr));
|
||||
static void syn_list_flags(struct name_list *nl, int flags, int attr);
|
||||
|
||||
/*
|
||||
* List one syntax item, for ":syntax" or "syntax list syntax_name".
|
||||
@@ -5478,7 +5477,7 @@ in_id_list (
|
||||
|
||||
struct subcommand {
|
||||
char *name; /* subcommand name */
|
||||
void (*func)__ARGS((exarg_T *, int)); /* function to call */
|
||||
void (*func)(exarg_T *, int); /* function to call */
|
||||
};
|
||||
|
||||
static struct subcommand subcommands[] =
|
||||
@@ -7744,8 +7743,8 @@ int highlight_changed(void) {
|
||||
return OK;
|
||||
}
|
||||
|
||||
static void highlight_list __ARGS((void));
|
||||
static void highlight_list_two __ARGS((int cnt, int attr));
|
||||
static void highlight_list(void);
|
||||
static void highlight_list_two(int cnt, int attr);
|
||||
|
||||
/*
|
||||
* Handle command line completion for :highlight command.
|
||||
|
||||
Reference in New Issue
Block a user