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

clang-format

Browse source
This commit is contained in:
Max Brunsfeld 2014-10-03 15:44:21 -07:00
parent 1fa3bf0f07
commit 78c5fe8e02
6 changed files with 39 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

37
include/tree_sitter/parser.h
View file

@ -80,30 +80,29 @@ struct TSLanguage {
TSTree *(*lex_fn)(TSLexer *, TSStateId);
};
#define DEBUG_LEX(...) \
if (lexer->debug) { \
fprintf(stderr, "LEX "); \
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, "\n"); \
#define DEBUG_LEX(...) \
if (lexer->debug) { \
fprintf(stderr, "LEX "); \
fprintf(stderr, __VA_ARGS__); \
fprintf(stderr, "\n"); \
}
#define START_LEXER() \
DEBUG_LEX("START %d", lex_state); \
int32_t lookahead; \
next_state: \
lookahead = ts_lexer_lookahead_char(lexer); \
DEBUG_LEX( \
(0 < lookahead && lookahead <= 255 ? "CHAR '%c'" : "CHAR %d"), \
lookahead);
#define START_LEXER() \
DEBUG_LEX("START %d", lex_state); \
int32_t lookahead; \
next_state: \
lookahead = ts_lexer_lookahead_char(lexer); \
DEBUG_LEX((0 < lookahead &&lookahead <= 255 ? "CHAR '%c'" : "CHAR %d"), \
lookahead);
#define START_TOKEN() ts_lexer_start_token(lexer);
#define ADVANCE(state_index) \
{ \
DEBUG_LEX("ADVANCE %d", state_index); \
ts_lexer_advance(lexer); \
lex_state = state_index; \
goto next_state; \
#define ADVANCE(state_index) \
{ \
DEBUG_LEX("ADVANCE %d", state_index); \
ts_lexer_advance(lexer); \
lex_state = state_index; \
goto next_state; \
}
#define ACCEPT_TOKEN(symbol) \

13
src/compiler/prepare_grammar/parse_regex.cc
View file

@ -30,8 +30,9 @@ class PatternParser {
explicit PatternParser(const string &input)
: input(input),
iter((const uint8_t *)input.data()),
end(iter + input.size())
{ next(); }
end(iter + input.size()) {
next();
}
pair<rule_ptr, const GrammarError *> rule(bool nested) {
vector<rule_ptr> choices = {};
@ -206,13 +207,9 @@ class PatternParser {
iter += lookahead_size;
}
uint32_t peek() {
return lookahead;
}
uint32_t peek() { return lookahead; }
bool has_more_input() {
return lookahead && iter <= end;
}
bool has_more_input() { return lookahead && iter <= end; }
pair<rule_ptr, const GrammarError *> error(string msg) {
return { blank(), new GrammarError(GrammarErrorTypeRegex, msg) };

17
src/runtime/lexer.c
View file

@ -43,8 +43,10 @@ static int advance(TSLexer *lexer) {
}
static TSTree *accept(TSLexer *lexer, TSSymbol symbol, int is_hidden) {
TSLength size = ts_length_sub(lexer->current_position, lexer->token_start_position);
TSLength padding = ts_length_sub(lexer->token_start_position, lexer->token_end_position);
TSLength size =
ts_length_sub(lexer->current_position, lexer->token_start_position);
TSLength padding =
ts_length_sub(lexer->token_start_position, lexer->token_end_position);
lexer->token_end_position = lexer->current_position;
return (symbol == ts_builtin_sym_error)
? ts_tree_make_error(size, padding, ts_lexer_lookahead_char(lexer))
@ -57,9 +59,8 @@ static TSTree *accept(TSLexer *lexer, TSSymbol symbol, int is_hidden) {
* this library.
*/
TSLexer ts_lexer_make() {
TSLexer result = (TSLexer) { .debug = 0,
.advance_fn = advance,
.accept_fn = accept, };
TSLexer result =
(TSLexer) { .debug = 0, .advance_fn = advance, .accept_fn = accept, };
ts_lexer_reset(&result);
return result;
}
@ -68,9 +69,9 @@ void ts_lexer_reset(TSLexer *lexer) {
lexer->chunk = NULL;
lexer->chunk_start = 0;
lexer->chunk_size = 0;
lexer->current_position = ts_length_zero(),
lexer->token_start_position = ts_length_zero(),
lexer->token_end_position = ts_length_zero(),
lexer->current_position = ts_length_zero();
lexer->token_start_position = ts_length_zero();
lexer->token_end_position = ts_length_zero();
lexer->lookahead = 0;
lexer->lookahead_size = 0;
}

8
src/runtime/parser.c
View file

@ -153,9 +153,8 @@ static int handle_error(TSParser *parser) {
ts_stack_shrink(&parser->stack, entry - parser->stack.entries + 1);
parser->lookahead->padding = ts_length_zero();
error->size = ts_length_sub(
ts_length_sub(
parser->lexer.token_start_position,
ts_stack_right_position(&parser->stack)),
ts_length_sub(parser->lexer.token_start_position,
ts_stack_right_position(&parser->stack)),
error->padding);
ts_stack_push(&parser->stack, state_after_error, error);
ts_tree_release(error);
@ -189,7 +188,8 @@ static int handle_error(TSParser *parser) {
static TSTree *get_root(TSParser *parser) {
if (parser->stack.size == 0)
ts_stack_push(&parser->stack, 0, ts_tree_make_error(ts_length_zero(), ts_length_zero(), 0));
ts_stack_push(&parser->stack, 0,
ts_tree_make_error(ts_length_zero(), ts_length_zero(), 0));
reduce(parser, ts_builtin_sym_document, parser->stack.size);
parser->lookahead->options = 0;

3
src/runtime/stack.h
View file

@ -28,8 +28,7 @@ TSLength ts_stack_right_position(const TSStack *stack);
#define TS_STACK_FROM_TOP(stack, entry) \
for (TSStackEntry *entry = stack.entries + stack.size - 1; \
entry >= stack.entries; \
entry--)
entry >= stack.entries; entry--)
#ifdef __cplusplus
}

3
src/runtime/tree.c
View file

@ -97,7 +97,8 @@ TSTree *ts_tree_make_node(TSSymbol symbol, size_t child_count,
TSTreeChild *grandchildren = ts_tree_visible_children(child, &n);
for (size_t j = 0; j < n; j++) {
visible_children[vis_i].tree = grandchildren[j].tree;
visible_children[vis_i].offset = ts_length_add(offset, grandchildren[j].offset);
visible_children[vis_i].offset =
ts_length_add(offset, grandchildren[j].offset);
vis_i++;
}
}