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

Extract helper method for precedence in lex_item_transitions

Browse source
This commit is contained in:
Max Brunsfeld 2015-11-01 21:20:59 -08:00
parent d7cb48aae7
commit 5073af0d03
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/compiler/build_tables/lex_item_transitions.cc
View file

@ -73,6 +73,12 @@ class LexItemTransitions : public rules::RuleFn<void> {
{ new_char_set, { new_item_set, new_precedence_range } });
}
PrecedenceRange merge_precedence(PrecedenceRange precedence) {
if (precedence.empty && !precedence_stack->empty())
precedence.add(precedence_stack->back());
return precedence;
}
void apply_to(const CharacterSet *rule) {
merge_transition(transitions, *rule,
LexItemSet({
@ -90,15 +96,11 @@ class LexItemTransitions : public rules::RuleFn<void> {
LexItemSet::TransitionMap left_transitions;
LexItemTransitions(&left_transitions, this).apply(rule->left);
for (const auto &pair : left_transitions) {
PrecedenceRange precedence(pair.second.second);
if (precedence.empty && !precedence_stack->empty())
precedence.add(precedence_stack->back());
merge_transition(
transitions, pair.first,
transform_item_set(pair.second.first, [&rule](rule_ptr item_rule) {
return rules::Seq::build({ item_rule, rule->right });
}), precedence);
}), merge_precedence(pair.second.second));
}
if (rule_can_be_blank(rule->left))
@ -109,17 +111,13 @@ class LexItemTransitions : public rules::RuleFn<void> {
LexItemSet::TransitionMap content_transitions;
LexItemTransitions(&content_transitions, this).apply(rule->content);
for (const auto &pair : content_transitions) {
PrecedenceRange precedence(pair.second.second);
if (precedence.empty && !precedence_stack->empty())
precedence.add(precedence_stack->back());
merge_transition(transitions, pair.first, pair.second.first,
precedence);
merge_precedence(pair.second.second));
merge_transition(
transitions, pair.first,
transform_item_set(pair.second.first, [&rule](rule_ptr item_rule) {
return rules::Seq::build({ item_rule, rule->copy() });
}), precedence);
}), merge_precedence(pair.second.second));
}
}