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

Added alternation and fixed a bug with the repetition operators exposed by the addition of the alternation. (for some reason the repetition operators used a loop making endless circles)

Browse Source
This commit is contained in:
Nathan Braswell
2013-07-04 15:10:32 -04:00
parent 84566c4ff6
commit 502929963c
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/RegEx.cpp
View File

@@ -11,9 +11,10 @@ RegEx::RegEx(std::string inPattern) {
case '*':
{
std::cout << "Star at " << i << " in " << pattern << std::endl;
for (std::vector<RegExState*>::size_type j = 0; j < currentStates.size(); j++)
for (std::vector<RegExState*>::size_type k = 0; k < currentStates.size(); k++)
currentStates[j]->addNext(currentStates[k]);
// for (std::vector<RegExState*>::size_type j = 0; j < currentStates.size(); j++)
// for (std::vector<RegExState*>::size_type k = 0; k < currentStates.size(); k++)
// currentStates[j]->addNext(currentStates[k]);
currentStates[currentStates.size()-1]->addNext(currentStates[currentStates.size()-1]);
//add all previous states to current states to enable skipping over the starred item
currentStates.insert(currentStates.end(), previousStates.begin(), previousStates.end());
}
@@ -23,9 +24,10 @@ RegEx::RegEx(std::string inPattern) {
std::cout << "Plus at " << i << " in " << pattern << std::endl;
//OtherThingy
//current->addNext(current);
for (std::vector<RegExState*>::size_type j = 0; j < currentStates.size(); j++)
for (std::vector<RegExState*>::size_type k = 0; k < currentStates.size(); k++)
currentStates[j]->addNext(currentStates[k]);
// for (std::vector<RegExState*>::size_type j = 0; j < currentStates.size(); j++)
// for (std::vector<RegExState*>::size_type k = 0; k < currentStates.size(); k++)
// currentStates[j]->addNext(currentStates[k]);
currentStates[currentStates.size()-1]->addNext(currentStates[currentStates.size()-1]);
}
break;
case '?':
@@ -36,8 +38,16 @@ RegEx::RegEx(std::string inPattern) {
}
break;
case '|':
{
std::cout << "Alternation at " << i << " in " << pattern << std::endl;
//alternation
i++;
RegExState* next = new RegExState(pattern[i]);
for (std::vector<RegExState*>::size_type j = 0; j < previousStates.size(); j++)
previousStates[j]->addNext(next);
currentStates.push_back(next);
}
break;
case '(':
std::cout << "Begin peren at " << i << " in " << pattern << std::endl;