mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename syntax_rule to edit_syntax_rule_t. 

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2012-10-10 12:29:09 +04:00
parent 3c69a2cafb
commit ef0dd43430
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/editor/editwidget.h
View File

@ -37,7 +37,8 @@ struct edit_book_mark_t
edit_book_mark_t *prev;
};
struct syntax_rule
typedef struct edit_syntax_rule_t edit_syntax_rule_t;
struct edit_syntax_rule_t
{
unsigned short keyword;
unsigned char end;
@ -158,7 +159,7 @@ struct WEdit
struct _syntax_marker *syntax_marker;
struct context_rule **rules;
long last_get_rule;
struct syntax_rule rule;
edit_syntax_rule_t rule;
char *syntax_type; /* description of syntax highlighting type being used */
GTree *defines; /* List of defines */
gboolean is_case_insensitive; /* selects language case sensitivity */

12
src/editor/syntax.c
View File

@ -126,7 +126,7 @@ struct context_rule
struct _syntax_marker
{
long offset;
struct syntax_rule rule;
edit_syntax_rule_t rule;
struct _syntax_marker *next;
};
@ -351,8 +351,8 @@ xx_strchr (WEdit * edit, const unsigned char *s, int char_byte)
/* --------------------------------------------------------------------------------------------- */
static struct syntax_rule
apply_rules_going_right (WEdit * edit, long i, struct syntax_rule rule)
static edit_syntax_rule_t
apply_rules_going_right (WEdit * edit, long i, edit_syntax_rule_t rule)
{
struct context_rule *r;
int c;
@ -361,7 +361,7 @@ apply_rules_going_right (WEdit * edit, long i, struct syntax_rule rule)
gboolean keyword_foundleft = FALSE, keyword_foundright = FALSE;
gboolean is_end;
long end = 0;
struct syntax_rule _rule = rule;
edit_syntax_rule_t _rule = rule;
c = xx_tolower (edit, edit_get_byte (edit, i));
if (c == 0)
@ -548,7 +548,7 @@ apply_rules_going_right (WEdit * edit, long i, struct syntax_rule rule)
/* --------------------------------------------------------------------------------------------- */
static struct syntax_rule
static edit_syntax_rule_t
edit_get_rule (WEdit * edit, off_t byte_index)
{
long i;
@ -604,7 +604,7 @@ edit_get_rule (WEdit * edit, off_t byte_index)
/* --------------------------------------------------------------------------------------------- */
static inline void
translate_rule_to_color (WEdit * edit, struct syntax_rule rule, int *color)
translate_rule_to_color (WEdit * edit, edit_syntax_rule_t rule, int *color)
{
*color = edit->rules[rule.context]->keyword[rule.keyword]->color;
}