traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid anonymous nested struct to silence override-init warnings

Browse source
This commit is contained in:
Max Brunsfeld 2016-10-26 11:10:56 -07:00
parent f11b729dfb
commit e53beb66c9
2 changed files with 47 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

42
include/tree_sitter/parser.h
View file

@ -43,7 +43,7 @@ typedef struct {
TSSymbol symbol;
unsigned short child_count;
};
};
} params;
TSParseActionType type : 4;
bool extra : 1;
bool fragile : 1;
@ -103,14 +103,18 @@ typedef struct TSLanguage {
* Parse Table Macros
*/
#define SHIFT(to_state_value) \
{ \
{ .type = TSParseActionTypeShift, .to_state = to_state_value } \
#define SHIFT(to_state_value) \
{ \
{ \
.type = TSParseActionTypeShift, .params = {.to_state = to_state_value } \
} \
}
#define RECOVER(to_state_value) \
{ \
{ .type = TSParseActionTypeRecover, .to_state = to_state_value } \
#define RECOVER(to_state_value) \
{ \
{ \
.type = TSParseActionTypeRecover, .params = {.to_state = to_state_value } \
} \
}
#define SHIFT_EXTRA() \
@ -118,20 +122,20 @@ typedef struct TSLanguage {
{ .type = TSParseActionTypeShift, .extra = true } \
}
#define REDUCE(symbol_val, child_count_val) \
{ \
{ \
.type = TSParseActionTypeReduce, .symbol = symbol_val, \
.child_count = child_count_val, \
} \
#define REDUCE(symbol_val, child_count_val) \
{ \
{ \
.type = TSParseActionTypeReduce, \
.params = {.symbol = symbol_val, .child_count = child_count_val } \
} \
}
#define REDUCE_FRAGILE(symbol_val, child_count_val) \
{ \
{ \
.type = TSParseActionTypeReduce, .symbol = symbol_val, \
.child_count = child_count_val, .fragile = true, \
} \
#define REDUCE_FRAGILE(symbol_val, child_count_val) \
{ \
{ \
.type = TSParseActionTypeReduce, .fragile = true, \
.params = {.symbol = symbol_val, .child_count = child_count_val } \
} \
}
#define ACCEPT_INPUT() \