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

Separate auxiliary rules from user-specified rules

Browse source
This commit is contained in:
Max Brunsfeld 2014-01-28 13:27:30 -08:00
parent 19e5b2a563
commit fd0d77ef8b
16 changed files with 741 additions and 412 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/compiler/prepare_grammar/expand_repeats.cpp
View file

@ -13,7 +13,7 @@ namespace tree_sitter {
rule_ptr value;
unordered_map<string, const rule_ptr> aux_rules;
rule_ptr apply(const rule_ptr rule) {
rule_ptr apply(const rule_ptr &rule) {
rule->accept(*this);
return value;
}
@ -21,7 +21,7 @@ namespace tree_sitter {
rule_ptr make_repeat_helper(string name, const rule_ptr &rule) {
return seq({
rule,
choice({ sym(name), blank() })
choice({ aux_sym(name), blank() })
});
}
@ -29,7 +29,7 @@ namespace tree_sitter {
rule_ptr inner_rule = apply(rule->content);
string helper_rule_name = string("repeat_helper") + to_string(aux_rules.size() + 1);
aux_rules.insert({ helper_rule_name, make_repeat_helper(helper_rule_name, inner_rule) });
value = sym(helper_rule_name);
value = aux_sym(helper_rule_name);
}
void visit(const Seq *rule) {
@ -48,11 +48,11 @@ namespace tree_sitter {
Grammar expand_repeats(const Grammar &grammar) {
unordered_map<string, const rule_ptr> result;
RepeatExpander visitor;
for (auto pair : grammar.rules)
result.insert({ pair.first, visitor.apply(pair.second) });
for (auto pair : visitor.aux_rules)
result.insert(pair);
return Grammar(grammar.start_rule_name, result);
return Grammar(grammar.start_rule_name, result, visitor.aux_rules);
}
}
}