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

Some small beauty fixes

This commit is contained in:
Robin Jadoul 2016-05-24 12:01:38 +02:00
parent ae28ed1c65
commit 4ae4e2b12f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/inputparser.cpp
View File

@ -22,8 +22,8 @@ namespace lxs {
dfa = minimize(dfa); dfa = minimize(dfa);
return dfa; return dfa;
} }
std::vector<std::pair<std::string,std::string> > InputParser::parseLines(std::istream &is) { std::vector<std::pair<std::string,std::string> > InputParser::parseLines(std::istream &is) {
std::string line; std::string line;
std::vector<std::pair<std::string,std::string> > result; std::vector<std::pair<std::string,std::string> > result;
while(std::getline(is,line)) { while(std::getline(is,line)) {
@ -39,6 +39,7 @@ namespace lxs {
} }
return result; return result;
} }
std::vector<ENFA> InputParser::linesToEnfa(std::vector<std::pair<std::string,std::string> > &input) { std::vector<ENFA> InputParser::linesToEnfa(std::vector<std::pair<std::string,std::string> > &input) {
std::vector<ENFA> result; std::vector<ENFA> result;
for(unsigned int i=0;i<input.size();i++) { for(unsigned int i=0;i<input.size();i++) {
@ -47,11 +48,11 @@ namespace lxs {
re->toENFA(enfa,0); re->toENFA(enfa,0);
enfa.numStates++; enfa.numStates++;
enfa.starting = 0; enfa.starting = 0;
enfa.priority.insert(std::make_pair((State) *enfa.accepting.begin(),(Priority) i)); enfa.priority[(State) *enfa.accepting.begin()] = (Priority) i;
enfa.acceptingToken.insert(std::make_pair((State) *enfa.accepting.begin(),input[i].first)); enfa.acceptingToken[(State) *enfa.accepting.begin()] = input[i].first;
result.push_back(enfa); result.push_back(enfa);
} }
return result; return result;
} }
} }