miloignis/kraken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for state generation to reduce memory usage - adding in optional semicolons balooned our memory usage to somewhere under 8 gigs, with some simple refactoring we're back down to a bit over 4. Needs to be smaller, but it's an improvement

Browse Source
This commit is contained in:
Nathan Braswell
2015-03-23 14:35:28 -04:00
parent f8e82b5302
commit 2c4dbc60d1
11 changed files with 89 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/State.cpp
View File

@@ -25,10 +25,10 @@ const bool State::operator==(const State &other) {
return false;
}
if (remaining.size() != other.remaining.size())
if (remaining.size() != other.remaining.size())
return false;
for (std::vector< ParseRule* >::size_type i = 0; i < remaining.size(); i++) {
if ( *(remaining[i]) != *(other.remaining[i]) )
if ( *(remaining[i]) != *(other.remaining[i]) )
return false;
}
return true;
@@ -77,12 +77,11 @@ void State::combineStates(State &other) {
addParents(other.getParents());
}
std::vector<ParseRule*>* State::getTotal() {
total.clear();
//std::cout << "Vector will be " << basis.size() << " + " << remaining.size() << std::endl;
std::vector<ParseRule*> State::getTotal() {
std::vector<ParseRule*> total;
total.insert(total.begin(), basis.begin(), basis.end());
total.insert(total.end(), remaining.begin(), remaining.end());
return(&total);
return total;
}
std::vector<ParseRule*>* State::getBasis() {
return &basis;
@@ -92,7 +91,7 @@ std::vector<ParseRule*>* State::getRemaining() {
}
bool State::containsRule(ParseRule* rule) {
getTotal();
auto total = getTotal();
for (std::vector<ParseRule*>::size_type i = 0; i < total.size(); i++) {
if (*rule == *(total[i])) {
return true;
@@ -102,7 +101,7 @@ bool State::containsRule(ParseRule* rule) {
}
void State::addRuleCombineLookahead(ParseRule* rule) {
getTotal();
auto total = getTotal();
bool alreadyIn = false;
for (std::vector<ParseRule*>::size_type i = 0; i < total.size(); i++) {
if (rule->equalsExceptLookahead(*(total[i]))) {
@@ -162,4 +161,4 @@ std::vector<State*>* State::getDeepParents(int depth) {
int State::getNumber() {
return number;
}
}