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

input parser changes

This commit is contained in:
kwullaer 2017-01-25 13:31:20 +01:00
parent 572067071e
commit 03e9e41e9e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/inputparser.cpp
View File

@ -59,7 +59,7 @@ namespace pds {
*/ */
case ParsodusLexer::TERMINAL: case ParsodusLexer::TERMINAL:
if(readingTerminals) { if(readingTerminals) {
config.grammar.terminals.insert(token.content.substr(1, token.content.size - 1)); config.grammar.terminals.insert(token.content.substr(1, token.content.size() - 2));
} else { } else {
throw InputParserException("Found a terminal outside a grammar or terminals section: " + token.content); throw InputParserException("Found a terminal outside a grammar or terminals section: " + token.content);
} }
@ -68,12 +68,12 @@ namespace pds {
lexColon(lex, token); lexColon(lex, token);
if(token.type != ParsodusLexer::VARIABLE) if(token.type != ParsodusLexer::VARIABLE)
throw InputParserException("Expected to find a start variable, but found: " + token.content); throw InputParserException("Expected to find a start variable, but found: " + token.content);
config.grammar.start = token.content.substr(1, token.content.size - 1); config.grammar.start = token.content.substr(1, token.content.size() - 2);
break; break;
case ParsodusLexer::VARIABLE: case ParsodusLexer::VARIABLE:
if(readingGrammar) { if(readingGrammar) {
if(config.grammar.variables.find(token.content) == config.grammar.variables.end()) if(config.grammar.variables.find(token.content) == config.grammar.variables.end())
config.grammar.variables.insert(token.content.substr(1, token.content.size - 1)); config.grammar.variables.insert(token.content.substr(1, token.content.size() - 2));
std::string current_head = token.content; std::string current_head = token.content;
// Parsing rule // Parsing rule
@ -85,7 +85,7 @@ namespace pds {
bool parsing_head = true; bool parsing_head = true;
while(parsing_head) { while(parsing_head) {
token = lex.nextToken(); token = lex.nextToken();
token.content = token.content.substr(1, token.content.size - 1); token.content = token.content.substr(1, token.content.size() - 2);
switch(token.type) { switch(token.type) {
case ParsodusLexer::VARIABLE: case ParsodusLexer::VARIABLE:
rule->tail.push_back(token.content); rule->tail.push_back(token.content);
@ -133,7 +133,7 @@ namespace pds {
throw InputParserException("Expecting to find a terminal, but found '" + token.content + "' instead'"); throw InputParserException("Expecting to find a terminal, but found '" + token.content + "' instead'");
if (config.grammar.precedence.find(token.type) == config.grammar.precedence) if (config.grammar.precedence.find(token.type) == config.grammar.precedence)
throw InputParserException("Found same terminal in multiple precedence rules"); throw InputParserException("Found same terminal in multiple precedence rules");
config.grammar.precedence.insert(make_pair(token.content.substr(1, token.content.size - 1), make_pair(counter++, precedence_type))); config.grammar.precedence.insert(make_pair(token.content.substr(1, token.content.size() - 2), make_pair(counter++, precedence_type)));
} }
} else } else