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 2015-11-01 21:21:07 -08:00
parent 5073af0d03
commit 7415c623aa
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/compiler/build_tables/build_lex_table.cc
View file

@ -86,12 +86,11 @@ class LexTableBuilder {
for (const rule_ptr &separator_rule : separator_rules)
result.entries.insert(LexItem(
symbol, rules::Seq::build({
rules::Metadata::build(
separator_rule,
{
{ rules::START_TOKEN, 1 },
{ rules::PRECEDENCE, -99999 },
}),
rules::Metadata::build(separator_rule,
{
{ rules::START_TOKEN, 1 },
{ rules::PRECEDENCE, -99999 },
}),
rule,
})));
}
@ -136,7 +135,8 @@ class LexTableBuilder {
LexItem::CompletionStatus completion_status = item.completion_status();
if (completion_status.is_done) {
auto current_action = lex_table.state(state_id).default_action;
auto action = LexAction::Accept(item.lhs, completion_status.precedence, completion_status.is_string);
auto action = LexAction::Accept(item.lhs, completion_status.precedence,
completion_status.is_string);
if (conflict_manager.resolve(action, current_action))
lex_table.state(state_id).default_action = action;
}

1
src/compiler/build_tables/parse_item.h
View file

@ -37,7 +37,6 @@ class ParseItem {
int variable_index;
const Production *production;
unsigned int step_index;
};
class ParseItemSet {

3
src/compiler/lex_table.cc
View file

@ -35,7 +35,8 @@ LexAction LexAction::Advance(size_t state_index,
}
LexAction LexAction::Accept(Symbol symbol, int precedence, bool is_string) {
return LexAction(LexActionTypeAccept, -1, symbol, { precedence, precedence }, is_string);
return LexAction(LexActionTypeAccept, -1, symbol, { precedence, precedence },
is_string);
}
bool LexAction::operator==(const LexAction &other) const {