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

Fixed some problems in the generated c++/lr parser

This commit is contained in:
Robin Jadoul 2017-01-19 14:08:53 +01:00
parent b777ffc52d
commit 832dcd813d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ enum Action {
/********************************************* /*********************************************
* Translate a Symbol to a readable string * * Translate a Symbol to a readable string *
*********************************************/ *********************************************/
std::string to_string({{name}}_Symbol s) { inline std::string to_string({{name}}_Symbol s) {
switch (s) { switch (s) {
{{#symbols}} {{#symbols}}
case {{name}}_Symbol::{{symbol}}: case {{name}}_Symbol::{{symbol}}:
@ -149,14 +149,14 @@ Value {{name}}<Value>::parse() {
} }
stateStack.push(TABLE[stateStack.top()][verr] >> 2); stateStack.push(TABLE[stateStack.top()][verr] >> 2);
valueStack.emplace(std::move(errorVal)); valueStack.emplace(Token{ {{name}}_Symbol::V_error, std::move(errorVal)});
while (tok != {{name}}_Symbol::T_EOF && (TABLE[stateStack.top()][static_cast<std::uint64_t>(tok.symbol)] & 0x3) == ERROR) { while (tok.symbol != {{name}}_Symbol::T_EOF && (TABLE[stateStack.top()][static_cast<std::uint64_t>(tok.symbol)] & 0x3) == ERROR) {
tok = lex(); tok = lex();
} }
if ((TABLE[stateStack.top()][static_cast<std::uint64_t>(tok.symbol)] & 0x3) == ERROR) { if ((TABLE[stateStack.top()][static_cast<std::uint64_t>(tok.symbol)] & 0x3) == ERROR) {
throw SyntaxError("Syntax error: could not recover"); throw SyntaxError("Syntax error: could not recover");
} }
} }
break; break;
case SHIFT: case SHIFT: