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

Cleaner collection of expected terminals

This commit is contained in:
Robin Jadoul 2017-01-22 12:59:35 +01:00
parent 98c83e435b
commit c9da57dec2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,11 +154,11 @@ Value {{name}}<Value>::parse() {
{ {
constexpr std::uint64_t verr = static_cast<std::uint64_t>({{name}}_Symbol::V_error); constexpr std::uint64_t verr = static_cast<std::uint64_t>({{name}}_Symbol::V_error);
std::vector<{{name}}_Symbol> expected; std::vector<{{name}}_Symbol> expected;
{{#symbols}} std::uint64_t top = stateStack.top();
if ({{name}}_Symbol::{{symbol}} <= {{name}}_Symbol::{{last_terminal}} && (TABLE[stateStack.top()][static_cast<std::uint64_t>({{name}}_Symbol::{{symbol}})] & 0x3) != ERROR) { for (std::uint64_t i = 0; i <= static_cast<std::uint64_t>({{name}}_Symbol::{{last_terminal}}); i++) {
expected.emplace_back({{name}}_Symbol::{{symbol}}); if ((TABLE[top][i] & 0x3) != ERROR)
expected.emplace_back(static_cast<{{name}}_Symbol>(i));
} }
{{/symbols}}
Value errorVal = error(tok, expected); Value errorVal = error(tok, expected);
while (!valueStack.empty() && (TABLE[stateStack.top()][verr] & 0x3) == ERROR) { while (!valueStack.empty() && (TABLE[stateStack.top()][verr] & 0x3) == ERROR) {