From 4ae4e2b12f2cd9a43ee81e5e2217b129de2e9ca0 Mon Sep 17 00:00:00 2001
From: Robin Jadoul <robin.jadoul@gmail.com>
Date: Tue, 24 May 2016 12:01:38 +0200
Subject: [PATCH] Some small beauty fixes
---
src/inputparser.cpp | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/inputparser.cpp b/src/inputparser.cpp
index a2f8b3e..2bd3ea9 100644
--- a/src/inputparser.cpp
+++ b/src/inputparser.cpp
@@ -22,8 +22,8 @@ namespace lxs {
dfa = minimize(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::vector<std::pair<std::string,std::string> > result;
while(std::getline(is,line)) {
@@ -39,6 +39,7 @@ namespace lxs {
}
return result;
}
+
std::vector<ENFA> InputParser::linesToEnfa(std::vector<std::pair<std::string,std::string> > &input) {
std::vector<ENFA> result;
for(unsigned int i=0;i<input.size();i++) {
@@ -47,11 +48,11 @@ namespace lxs {
re->toENFA(enfa,0);
enfa.numStates++;
enfa.starting = 0;
- enfa.priority.insert(std::make_pair((State) *enfa.accepting.begin(),(Priority) i));
- enfa.acceptingToken.insert(std::make_pair((State) *enfa.accepting.begin(),input[i].first));
+ enfa.priority[(State) *enfa.accepting.begin()] = (Priority) i;
+ enfa.acceptingToken[(State) *enfa.accepting.begin()] = input[i].first;
result.push_back(enfa);
}
-
+
return result;
}
}