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

Remove nesting in parse action struct

Browse source
This commit is contained in:
Max Brunsfeld 2016-06-21 21:36:33 -07:00
parent 634ee29d10
commit 6a7a5cfc3f
2 changed files with 51 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

52
include/tree_sitter/parser.h
View file

@ -74,7 +74,7 @@ typedef struct {
TSSymbol symbol;
unsigned short child_count;
};
} data;
};
TSParseActionType type : 3;
bool extra : 1;
bool fragile : 1;
@ -151,17 +151,13 @@ struct TSLanguage {
{ .type = TSParseActionTypeError } \
}
#define SHIFT(to_state_value) \
{ \
{ \
.type = TSParseActionTypeShift, .data = {.to_state = to_state_value } \
} \
#define SHIFT(to_state_value) \
{ \
{ .type = TSParseActionTypeShift, .to_state = to_state_value } \
}
#define RECOVER(to_state_value) \
{ \
.type = TSParseActionTypeRecover, .data = {.to_state = to_state_value } \
}
#define RECOVER(to_state_value) \
{ .type = TSParseActionTypeRecover, .to_state = to_state_value }
#define RECOVER_EXTRA() \
{ .type = TSParseActionTypeShift, .extra = true, }
@ -171,28 +167,28 @@ struct TSLanguage {
{ .type = TSParseActionTypeShift, .extra = true } \
}
#define REDUCE_EXTRA(symbol_val) \
{ \
{ \
.type = TSParseActionTypeReduce, .extra = true, \
.data = {.symbol = symbol_val, .child_count = 1 } \
} \
#define REDUCE_EXTRA(symbol_val) \
{ \
{ \
.type = TSParseActionTypeReduce, .symbol = symbol_val, .child_count = 1, \
.extra = true, \
} \
}
#define REDUCE(symbol_val, child_count_val) \
{ \
{ \
.type = TSParseActionTypeReduce, .fragile = false, \
.data = {.symbol = symbol_val, .child_count = child_count_val } \
} \
#define REDUCE(symbol_val, child_count_val) \
{ \
{ \
.type = TSParseActionTypeReduce, .symbol = symbol_val, \
.child_count = child_count_val, \
} \
}
#define REDUCE_FRAGILE(symbol_val, child_count_val) \
{ \
{ \
.type = TSParseActionTypeReduce, .fragile = true, \
.data = {.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 ACCEPT_INPUT() \