Skip to content

Commit 6cf879f

Browse files
committed
release v1.1 final
- improved standard compliance ; compiles with msvc
1 parent 4f40f98 commit 6cf879f

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
**/*.sh
88
**/*.bat
99
**/*.reg
10+
**/*.json
1011

1112
# Sciebo temporary files
1213
**/*.~*
@@ -16,6 +17,11 @@
1617
.project
1718
.settings/
1819

20+
# Visual Studio files
21+
.vs/
22+
*.sln
23+
*.vcxproj*
24+
1925
# Non-development (or currently unused) directories
2026
icon/*
2127
!icon/icon.ico

__dependency_graph.dot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ digraph {
7676
main -> cstring [color=blue]
7777
main -> ctime [color=blue]
7878
main -> iostream [color=blue]
79+
main -> process [color=blue]
7980
main -> unistd [color=blue]
8081
subgraph "cluster_D:/Dropbox/eclipse/pmGenerator" {
8182
main

icon/icon.rc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
aaaa_icon ICON "icon.ico"
2-
3-
#include <wx/msw/wx.rc>

main.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
#include <cstring>
77
#include <ctime>
88
#include <iostream>
9+
#ifdef _MSC_VER
10+
#include <process.h>
11+
#else
912
#include <unistd.h>
13+
#endif
1014

1115
using namespace std;
1216
using namespace xamid::helper;
@@ -116,7 +120,7 @@ int main(int argc, char* argv[]) { // argc = 1 + N, argv = { <command>, <arg1>,
116120
return printUsage("Missing parameter for \"-g\".");
117121
try {
118122
tasks.emplace_back(Task::Generate, stoi(argv[++i]), "", "", "", "", true, true, false, false, 0, 0);
119-
} catch (exception& e) {
123+
} catch (...) {
120124
return printUsage("Invalid parameter \"" + string(argv[i]) + "\" for \"-g\".");
121125
}
122126
break;
@@ -211,7 +215,7 @@ int main(int argc, char* argv[]) { // argc = 1 + N, argv = { <command>, <arg1>,
211215
return printUsage("Missing parameter for \"-x\".");
212216
try {
213217
get<10>(tasks.back()) = stoll(argv[++i]); // get<10> = cutX
214-
} catch (exception& e) {
218+
} catch (...) {
215219
return printUsage("Invalid parameter \"" + string(argv[i]) + "\" for \"-x\".");
216220
}
217221
break;
@@ -222,7 +226,7 @@ int main(int argc, char* argv[]) { // argc = 1 + N, argv = { <command>, <arg1>,
222226
return printUsage("Missing parameter for \"-y\".");
223227
try {
224228
get<11>(tasks.back()) = stoll(argv[++i]); // get<11> = cutY
225-
} catch (exception& e) {
229+
} catch (...) {
226230
return printUsage("Invalid parameter \"" + string(argv[i]) + "\" for \"-y\".");
227231
}
228232
break;

metamath/DRuleParser.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ vector<pair<string, tuple<vector<shared_ptr<DlFormula>>, vector<string>, map<siz
552552
};
553553
auto updatePrimitives = [&]() {
554554
for (set<shared_ptr<DlFormula>>::iterator it = usedPrimitives.begin(); it != usedPrimitives.end();)
555-
if (it->unique()) { // default: used by freePrimitives or primitives
555+
if (it->use_count() == 1) {
556556
freePrimitives.emplace(*it);
557557
it = usedPrimitives.erase(it);
558558
} else
@@ -941,7 +941,7 @@ shared_ptr<DlFormula> DRuleParser::_parseEnclosedMmPlFormula(const string& strCo
941941
string_view::size_type opEndOffset = source.find(' ', opBeginOffset);
942942
if (opEndOffset == string_view::npos)
943943
throw invalid_argument("DRuleParser::parseConsequent(): Invalid formula \"" + myFormula + "\". There should be a binary operator ending with ' '.");
944-
binOp = string(source.begin() + opBeginOffset, opEndOffset - opBeginOffset);
944+
binOp = string(source.data() + opBeginOffset, opEndOffset - opBeginOffset);
945945
return opEndOffset;
946946
};
947947
auto applyUnaryOperators = [&](shared_ptr<DlFormula>& target, const vector<DlOperator>& unaryOperators) -> void {
@@ -968,7 +968,7 @@ shared_ptr<DlFormula> DRuleParser::_parseEnclosedMmPlFormula(const string& strCo
968968
string_view::size_type varEndOffset = source.find(' ', varBeginOffset);
969969
if (varEndOffset == string_view::npos)
970970
throw invalid_argument("DRuleParser::parseConsequent(): Invalid formula \"" + myFormula + "\". Source should contain a variable ending with ' '.");
971-
assignVariableTerm(target, string(varBegin, varEndOffset - varBeginOffset), unaryOperators);
971+
assignVariableTerm(target, string(&*varBegin, varEndOffset - varBeginOffset), unaryOperators);
972972
return varEndOffset;
973973
};
974974
auto readAndAssignEndingVariableTerm = [&](const string_view& source, shared_ptr<DlFormula>& target) -> void {

0 commit comments

Comments
 (0)