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

Remove custom map function on transition maps

Browse source
This commit is contained in:
Max Brunsfeld 2014-02-10 21:17:37 -08:00
parent 66f7dcf28a
commit 91489363ca
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/compiler/build_tables/rule_transitions.cpp
View file

@ -26,6 +26,14 @@ namespace tree_sitter {
return choice({ left, right });
});
}
template<typename T>
transition_map<T, Rule> map_transitions(const transition_map<T, Rule> &initial, std::function<const rule_ptr(rule_ptr)> map_fn) {
transition_map<T, Rule> result;
for (auto &pair : initial)
result.add(pair.first, map_fn(pair.second));
return result;
}
template<typename T>
class TransitionsVisitor : public rules::Visitor {
@ -59,7 +67,7 @@ namespace tree_sitter {
}
void visit(const Seq *rule) {
value = transitions(rule->left).template map<Rule>([&](const rule_ptr left_rule) -> rule_ptr {
value = map_transitions(transitions(rule->left), [&](const rule_ptr left_rule) -> rule_ptr {
if (is_blank(left_rule))
return rule->right;
else
@ -71,7 +79,7 @@ namespace tree_sitter {
}
void visit(const Repeat *rule) {
value = transitions(rule->content).template map<Rule>([&](const rule_ptr &value) -> rule_ptr {
value = map_transitions(transitions(rule->content), [&](const rule_ptr &value) -> rule_ptr {
return seq({ value, choice({ rule->copy(), blank() }) });
});
}

10
src/compiler/build_tables/transition_map.h
View file

@ -43,16 +43,6 @@ namespace tree_sitter {
return TValuePtr();
}
template<typename NewV>
transition_map<TKey, NewV> map(std::function<const std::shared_ptr<NewV>(TValuePtr)> map_fn) {
transition_map<TKey, NewV> result;
for (pair_type pair : *this) {
auto new_value = map_fn(pair.second);
result.add(pair.first, new_value);
}
return result;
}
#pragma mark - Container
typedef typename contents_type::const_iterator const_iterator;