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

Fixed a part of the problems with the bool specialization in the generated parser

This commit is contained in:
Thomas Avé 2017-01-21 23:03:49 +01:00
parent f81e53bc70
commit afb492b3b0
2 changed files with 42 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
templates/c++/lr.cpp
View File

@ -11,3 +11,44 @@ const std::uint64_t TABLE[{{num_states}}][{{num_symbols}}] = {
};
const unsigned char REDUCE_COUNT[{{num_rules}}] = { {{#rules}}{{rhs_length}},{{/rules}} };
bool {{name}}<bool>::parse() {
std::stack<std::uint64_t> stateStack;
using Sym = {{name}}_Symbol;
stateStack.push(0);
Sym tok = lex();
while (true) {
std::uint64_t act = TABLE[stateStack.top()][static_cast<std::uint64_t>(tok)];
switch (act & 0x3) {
case ERROR:
return false;
case SHIFT:
stateStack.push(act >> 2);
tok = lex();
break;
case REDUCE:
{
std::uint64_t tmp = act >> 2;
Sym symbol = static_cast<Sym>(tmp >> 31);
std::uint32_t rule = tmp & ((1ull << 31) - 1);
for (unsigned char i = 0; i < REDUCE_COUNT[rule]; i++) {
stateStack.pop();
}
stateStack.push(TABLE[stateStack.top()][static_cast<std::uint64_t>(symbol)] >> 2);
}
break;
case ACCEPT:
assert(stateStack.size() == 2);
return true;
default:
//IMPOSSIBLE
break;
}
}
}

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

@ -82,7 +82,7 @@ class {{name}}<bool> {
/**
* Parse it
*/
Value parse();
bool parse();
protected:
/******************************************
@ -224,46 +224,6 @@ Value {{name}}<Value>::parse() {
}
}
template <>
Value {{name}}<bool>::parse() {
std::stack<std::uint64_t> stateStack;
using Sym = {{name}}_Symbol;
stateStack.push(0);
Sym tok = lex();
while (true) {
std::uint64_t act = TABLE[stateStack.top()][static_cast<std::uint64_t>(tok)];
switch (act & 0x3) {
case ERROR:
return false;
case SHIFT:
stateStack.push(act >> 2);
tok = lex();
break;
case REDUCE:
{
std::uint64_t tmp = act >> 2;
Sym symbol = static_cast<Sym>(tmp >> 31);
std::uint32_t rule = tmp & ((1ull << 31) - 1);
for (unsigned char i = 0; i < REDUCE_COUNT[rule]; i++) {
stateStack.pop();
}
stateStack.push(TABLE[stateStack.top()][static_cast<std::uint64_t>(symbol)] >> 2);
}
break;
case ACCEPT:
assert(stateStack.size() == 2);
return true;
default:
//IMPOSSIBLE
break;
}
}
}
#undef REDUCE_COUNT
#undef TABLE