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

Change grammar to use a size_t indexable structure for rules (std::vector)

This commit is contained in:
Robin Jadoul 2016-12-16 19:02:32 +01:00
parent d51034dd0a
commit b526d95750
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Parsodus/grammar.h
View File

@ -32,7 +32,7 @@ namespace pds {
std::string start; ///< the starting variable
std::set<std::string> variables; ///< the variables
std::set<std::string> terminals; ///< the terminals
std::map<std::string, std::set<Rule> > rules; ///< the replacement rules
std::vector<Rule> rules; ///< the replacement rules
};
}

7
src/inputparser.cpp
View File

@ -72,10 +72,6 @@ namespace pds {
config.grammar.variables.insert(token.content);
std::string current_head = token.content;
std::set<Rule> current_rules;
if(config.grammar.rules.count(current_head)) {
current_rules = config.grammar.rules[current_head];
}
// Parsing rule
token = lex.nextToken();
if(token.type != ParsodusLexer::ARROW)
@ -96,14 +92,13 @@ namespace pds {
parsing_head = false;
case ParsodusLexer::PIPE:
rule.tail.shrink_to_fit();
current_rules.insert(rule);
config.grammar.rules.push_back(rule);
rule.tail.clear();
break;
default:
throw InputParserException("Expecting to find a variable, terminal, pipe or a semicolon, but found '" + token.content + "' instead");
}
}
config.grammar.rules[current_head] = current_rules;
} else
throw InputParserException("Found a variable outside a grammar section: " + token.content);
break;

11
src/main.cpp
View File

@ -35,14 +35,13 @@ int main(int argc, char** argv) {
std::cout << "Terminal: " << a << std::endl;
for(auto a: config.grammar.variables)
std::cout << "Variable: " << a << std::endl;
std::cout << "Rules: " << std::endl;
for(auto a: config.grammar.rules) {
std::cout << "Starting rule with head: " << a.first << std::endl;
for(auto b: a.second) {
std::cout << "\tRule with head: " << b.head << std::endl;
for(auto c: b.tail) {
std::cout << "\t\tFound replacement rule: " << c << std::endl;
}
std::cout << "\t" << a.head << " -> ";
for(auto c: a.tail) {
std::cout << c << " ";
}
std::cout << std::endl;
}
}