thomasave
/
Parsodus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backend change to allow for reduce rules with the same name

This commit is contained in:
Robin Jadoul 2017-01-16 19:04:21 +01:00
parent bf008e7043
commit e1208101b9
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/Parsodus/backends/cppLR.h
View File

@ -59,16 +59,27 @@ namespace backends {
topLevel["symbols"] = std::move(symbols); topLevel["symbols"] = std::move(symbols);
std::vector<templ::TemplateContext> rules; std::vector<templ::TemplateContext> rules;
std::set<std::string> rulenames;
for (std::size_t i = 0; i < config.grammar.rules.size(); i++) { for (std::size_t i = 0; i < config.grammar.rules.size(); i++) {
std::map<const std::string, templ::TemplateContext> r; std::map<const std::string, templ::TemplateContext> r;
r["index"] = templ::make_string(std::to_string(i)); r["index"] = templ::make_string(std::to_string(i));
r["rhs_length"] = templ::make_string(std::to_string(config.grammar.rules[i]->tail.size())); r["rhs_length"] = templ::make_string(std::to_string(config.grammar.rules[i]->tail.size()));
if (false /* the rule has a name */) if (false /* the rule has a name */) {
r["rname"] = templ::make_string(""); //The name r["rname"] = templ::make_string(""); //The name
rulenames.insert(""); //The name
} else {
rulenames.insert(std::to_string(i));
}
rules.push_back(templ::make_map(std::move(r))); rules.push_back(templ::make_map(std::move(r)));
} }
topLevel["rules"] = templ::make_array(std::move(rules)); topLevel["rules"] = templ::make_array(std::move(rules));
std::vector<templ::TemplateContext> rulenamesT;
for (auto& s : rulenames) {
rulenamesT.emplace_back(templ::make_map({{"rname", templ::make_string(s)}}));
}
topLevel["rulenames"] = templ::make_array(std::move(rulenamesT));
std::set<std::string> terminals = config.grammar.terminals; std::set<std::string> terminals = config.grammar.terminals;
terminals.insert(util::EOF_PLACEHOLDER); terminals.insert(util::EOF_PLACEHOLDER);
std::vector<templ::TemplateContext> states(table.act.size()); std::vector<templ::TemplateContext> states(table.act.size());

7
templates/c++/lr.h
View File

@ -51,10 +51,9 @@ class {{name}} {
/** /**
* Apply a reduction (a grammar rule in reverse) * Apply a reduction (a grammar rule in reverse)
*/ */
{{#rules}} {{#rulenames}}
{{#rname}}virtual Value reduce_{{rname}}(std::deque<Token> subparts) = 0;{{/rname}} virtual Value reduce_{{rname}}(std::deque<Token> subparts) = 0;
{{^rname}}virtual Value reduce_{{index}}(std::deque<Token> subparts) = 0;{{/rname}} {{/rulenames}}
{{/rules}}
private: private:
}; };