Username404-59/Yerbacon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a condition which has been useless since the e6334ad8 commit in main.cpp

Browse Source
This commit is contained in:
Username404 2021-09-25 22:01:44 +02:00
parent c696b440e7
commit 477337f96b
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main.cpp
View File

@ -43,30 +43,28 @@ int main(int argc, char* argv[]) {
vector<future<pair<string, optional<Yerbacon::Exception>>>> Units; vector<future<pair<string, optional<Yerbacon::Exception>>>> Units;
const launch& Policy = not parallel ? launch::deferred : launch::async; const launch& Policy = not parallel ? launch::deferred : launch::async;
for (const string_view& fileName: uniqueFiles) { for (const string_view& fileName: uniqueFiles) {
if (fileName != "none") { pair<string, optional<Yerbacon::Exception>> returnedPair;
pair<string, optional<Yerbacon::Exception>> returnedPair; Units.push_back(async(Policy, [&returnedPair, &fileName, &compile]() {
Units.push_back(async(Policy, [&returnedPair, &fileName, &compile]() { try {
try { returnedPair.first = compile(fileName);
returnedPair.first = compile(fileName); } catch (const Yerbacon::Exception& e) {
} catch (const Yerbacon::Exception& e) { unsigned long lastSlash = 0;
unsigned long lastSlash = 0; unsigned long position1 = fileName.find_last_of('/');
unsigned long position1 = fileName.find_last_of('/'); if (cmp_not_equal(position1, string_view::npos)) {
if (cmp_not_equal(position1, string_view::npos)) { #ifndef _WIN32
#ifndef _WIN32 lastSlash = position1;
lastSlash = position1; #else
#else unsigned long position2 = fileName.find_last_of('\\');
unsigned long position2 = fileName.find_last_of('\\'); if (cmp_not_equal(position2, string_view::npos)) {
if (cmp_not_equal(position2, string_view::npos)) { lastSlash = max(position1, position2);
lastSlash = max(position1, position2); }
} #endif
#endif
}
returnedPair.first = fileName.substr(lastSlash + 1);
returnedPair.second.emplace(e);
} }
return move(returnedPair); returnedPair.first = fileName.substr(lastSlash + 1);
})); returnedPair.second.emplace(e);
} }
return move(returnedPair);
}));
} }
if (printResult) cout << "~~~~[Yerbacon compilation result]~~~~\n\n"; if (printResult) cout << "~~~~[Yerbacon compilation result]~~~~\n\n";
for (future<pair<string, optional<Yerbacon::Exception>>>& currentFuture: Units) { for (future<pair<string, optional<Yerbacon::Exception>>>& currentFuture: Units) {