Skip to content

Commit bcc3c46

Browse files
xamidixamidi
committed
namespace renamings
'xamid' -> 'xamidi' and 'nortmann' -> 'logic'
1 parent 05a3b7a commit bcc3c46

29 files changed

+174
-174
lines changed

‎__dependency_graph.dot‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -69,53 +69,6 @@ digraph {
6969
Resources
7070
Version
7171
}
72-
main -> FctHelper [color=blue]
73-
main -> Version [color=blue]
74-
main -> DRuleReducer [color=blue]
75-
main -> DlProofEnumerator [color=blue]
76-
main -> cstring [color=blue]
77-
main -> ctime [color=blue]
78-
main -> iostream [color=blue]
79-
main -> process [color=blue]
80-
main -> unistd [color=blue]
81-
subgraph "cluster_D:/Dropbox/eclipse/pmGenerator" {
82-
main
83-
}
84-
DRuleParser -> FctHelper [color=blue]
85-
DRuleParser -> TreeNode [color=blue]
86-
DRuleParser -> DlCore [color=blue]
87-
DRuleParser -> DlFormula [color=blue]
88-
DRuleParser -> "boost/algorithm/string" [color=blue]
89-
DRuleParser -> iostream [color=blue]
90-
DRuleParser -> cstddef [color=red]
91-
DRuleParser -> map [color=red]
92-
DRuleParser -> memory [color=red]
93-
DRuleParser -> set [color=red]
94-
DRuleParser -> string_view [color=red]
95-
DRuleParser -> string [color=red]
96-
DRuleParser -> tuple [color=red]
97-
DRuleParser -> unordered_map [color=red]
98-
DRuleParser -> unordered_set [color=red]
99-
DRuleParser -> utility [color=red]
100-
DRuleParser -> vector [color=red]
101-
DRuleReducer -> FctHelper [color=blue]
102-
DRuleReducer -> TreeNode [color=blue]
103-
DRuleReducer -> DlCore [color=blue]
104-
DRuleReducer -> DlProofEnumerator [color=blue]
105-
DRuleReducer -> DRuleParser [color=blue]
106-
DRuleReducer -> concurrent_map [color=blue]
107-
DRuleReducer -> concurrent_unordered_map [color=blue]
108-
DRuleReducer -> concurrent_vector [color=blue]
109-
DRuleReducer -> parallel_for [color=blue]
110-
DRuleReducer -> "boost/algorithm/string" [color=blue]
111-
DRuleReducer -> iostream [color=blue]
112-
DRuleReducer -> string [color=red]
113-
subgraph "cluster_D:/Dropbox/eclipse/pmGenerator\metamath" {
114-
DRuleParser
115-
DRuleParser
116-
DRuleReducer
117-
DRuleReducer
118-
}
11972
DlCore -> FctHelper [color=blue]
12073
DlCore -> TreeNode [color=blue]
12174
DlCore -> CfgGrammar [color=blue]
@@ -166,7 +119,7 @@ digraph {
166119
DlProofEnumerator -> thread [color=red]
167120
DlStructure -> CfgGrammar [color=blue]
168121
DlStructure -> cstdint [color=red]
169-
subgraph "cluster_D:/Dropbox/eclipse/pmGenerator\nortmann" {
122+
subgraph "cluster_D:/Dropbox/eclipse/pmGenerator\logic" {
170123
DlCore
171124
DlCore
172125
DlFormula
@@ -176,6 +129,53 @@ digraph {
176129
DlStructure
177130
DlStructure
178131
}
132+
main -> FctHelper [color=blue]
133+
main -> Version [color=blue]
134+
main -> DRuleReducer [color=blue]
135+
main -> DlProofEnumerator [color=blue]
136+
main -> cstring [color=blue]
137+
main -> ctime [color=blue]
138+
main -> iostream [color=blue]
139+
main -> process [color=blue]
140+
main -> unistd [color=blue]
141+
subgraph "cluster_D:/Dropbox/eclipse/pmGenerator" {
142+
main
143+
}
144+
DRuleParser -> FctHelper [color=blue]
145+
DRuleParser -> TreeNode [color=blue]
146+
DRuleParser -> DlCore [color=blue]
147+
DRuleParser -> DlFormula [color=blue]
148+
DRuleParser -> "boost/algorithm/string" [color=blue]
149+
DRuleParser -> iostream [color=blue]
150+
DRuleParser -> cstddef [color=red]
151+
DRuleParser -> map [color=red]
152+
DRuleParser -> memory [color=red]
153+
DRuleParser -> set [color=red]
154+
DRuleParser -> string_view [color=red]
155+
DRuleParser -> string [color=red]
156+
DRuleParser -> tuple [color=red]
157+
DRuleParser -> unordered_map [color=red]
158+
DRuleParser -> unordered_set [color=red]
159+
DRuleParser -> utility [color=red]
160+
DRuleParser -> vector [color=red]
161+
DRuleReducer -> FctHelper [color=blue]
162+
DRuleReducer -> TreeNode [color=blue]
163+
DRuleReducer -> DlCore [color=blue]
164+
DRuleReducer -> DlProofEnumerator [color=blue]
165+
DRuleReducer -> DRuleParser [color=blue]
166+
DRuleReducer -> concurrent_map [color=blue]
167+
DRuleReducer -> concurrent_unordered_map [color=blue]
168+
DRuleReducer -> concurrent_vector [color=blue]
169+
DRuleReducer -> parallel_for [color=blue]
170+
DRuleReducer -> "boost/algorithm/string" [color=blue]
171+
DRuleReducer -> iostream [color=blue]
172+
DRuleReducer -> string [color=red]
173+
subgraph "cluster_D:/Dropbox/eclipse/pmGenerator\metamath" {
174+
DRuleParser
175+
DRuleParser
176+
DRuleReducer
177+
DRuleReducer
178+
}
179179
TreeNode -> ICloneable [color=red]
180180
TreeNode -> IPrintable [color=red]
181181
TreeNode -> algorithm [color=red]

‎grammar/CfgGrammar.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#include <regex>
66

77
using namespace std;
8-
using namespace xamid::helper;
8+
using namespace xamidi::helper;
99

10-
namespace xamid {
10+
namespace xamidi {
1111
namespace grammar {
1212

1313
CfgGrammar::CfgGrammar(const string& startSymbolString, const string& grammarString) :

‎grammar/CfgGrammar.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
#ifndef XAMID_GRAMMAR_CFGGRAMMAR_H
2-
#define XAMID_GRAMMAR_CFGGRAMMAR_H
1+
#ifndef XAMIDI_GRAMMAR_CFGGRAMMAR_H
2+
#define XAMIDI_GRAMMAR_CFGGRAMMAR_H
33

44
#include "../helper/IPrintable.h"
55

66
#include <cstdint>
77
#include <unordered_map>
88
#include <vector>
99

10-
namespace xamid {
10+
namespace xamidi {
1111
namespace grammar {
1212

1313
// Represents a context-free grammar
@@ -69,4 +69,4 @@ struct CfgGrammar: public helper::IPrintable {
6969
}
7070
}
7171

72-
#endif // XAMID_GRAMMAR_CFGGRAMMAR_H
72+
#endif // XAMIDI_GRAMMAR_CFGGRAMMAR_H

‎helper/FctHelper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
using namespace std;
77

8-
namespace xamid {
8+
namespace xamidi {
99
namespace helper {
1010

1111
bool cmpStringShrink::operator()(const string& a, const string& b) const {

‎helper/FctHelper.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef XAMID_HELPER_FCTHELPER_H
2-
#define XAMID_HELPER_FCTHELPER_H
1+
#ifndef XAMIDI_HELPER_FCTHELPER_H
2+
#define XAMIDI_HELPER_FCTHELPER_H
33

44
#include <algorithm>
55
#include <array>
@@ -17,7 +17,7 @@
1717
#include <string>
1818
#include <vector>
1919

20-
namespace xamid {
20+
namespace xamidi {
2121
namespace helper {
2222

2323
struct cmpStringGrow {
@@ -230,4 +230,4 @@ struct FctHelper {
230230
}
231231
}
232232

233-
#endif // XAMID_HELPER_FCTHELPER_H
233+
#endif // XAMIDI_HELPER_FCTHELPER_H

‎helper/FwdTbb.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef XAMID_HELPER_FWDTBB_H
2-
#define XAMID_HELPER_FWDTBB_H
1+
#ifndef XAMIDI_HELPER_FWDTBB_H
2+
#define XAMIDI_HELPER_FWDTBB_H
33

44
#if __has_include(<tbb/version.h>)
55
#include <tbb/version.h>
@@ -39,7 +39,7 @@ using interface10::concurrent_map;
3939
#endif
4040
}
4141

42-
namespace xamid {
42+
namespace xamidi {
4343
template<typename T> using tbb_concurrent_vector = tbb::concurrent_vector<T, tbb::cache_aligned_allocator<T>>;
4444
#if TBB_INTERFACE_VERSION >= 12002 // since v2021.1-beta08
4545
template<typename Key, typename T> using tbb_concurrent_unordered_map = tbb::concurrent_unordered_map<Key, T, std::hash<Key>, std::equal_to<Key>, tbb::tbb_allocator<std::pair<const Key, T>>>;
@@ -51,4 +51,4 @@ template<typename Key> using tbb_concurrent_unordered_set = tbb::concurrent_unor
5151
template<typename Key, typename Value> using tbb_concurrent_map = tbb::concurrent_map<Key, Value, std::less<Key>, tbb::tbb_allocator<std::pair<const Key, Value>>>;
5252
}
5353

54-
#endif // XAMID_HELPER_FWDTBB_H
54+
#endif // XAMIDI_HELPER_FWDTBB_H

‎helper/Hashing.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef XAMID_HELPER_HASHING_H
2-
#define XAMID_HELPER_HASHING_H
1+
#ifndef XAMIDI_HELPER_HASHING_H
2+
#define XAMIDI_HELPER_HASHING_H
33

44
// Idea: http://stackoverflow.com/q/7110301
55

@@ -9,7 +9,7 @@
99
#include <utility>
1010
#include <vector>
1111

12-
namespace xamid {
12+
namespace xamidi {
1313
namespace helper {
1414

1515
// Code from boost
@@ -88,4 +88,4 @@ struct myhash<std::pair<T, U>> {
8888
}
8989
}
9090

91-
#endif // XAMID_HELPER_HASHING_H
91+
#endif // XAMIDI_HELPER_HASHING_H

‎helper/ICloneable.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#ifndef XAMID_HELPER_ICLONEABLE_H
2-
#define XAMID_HELPER_ICLONEABLE_H
1+
#ifndef XAMIDI_HELPER_ICLONEABLE_H
2+
#define XAMIDI_HELPER_ICLONEABLE_H
33

44
#include <memory>
55
#include <unordered_map>
66

7-
namespace xamid {
7+
namespace xamidi {
88
namespace helper {
99

1010
// T : type of class that becomes cloneable
@@ -133,4 +133,4 @@ struct ICopyable {
133133
}
134134
}
135135

136-
#endif // XAMID_HELPER_ICLONEABLE_H
136+
#endif // XAMIDI_HELPER_ICLONEABLE_H

‎helper/IPrintable.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using namespace std;
66

7-
namespace xamid {
7+
namespace xamidi {
88
namespace helper {
99

1010
//#######################

‎helper/IPrintable.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#ifndef XAMID_HELPER_IPRINTABLE_H
2-
#define XAMID_HELPER_IPRINTABLE_H
1+
#ifndef XAMIDI_HELPER_IPRINTABLE_H
2+
#define XAMIDI_HELPER_IPRINTABLE_H
33

44
#include <memory>
55
#include <string>
66

7-
namespace xamid {
7+
namespace xamidi {
88
namespace helper {
99

1010
//#######################
@@ -31,7 +31,7 @@ struct IPrintable {
3131

3232
template<typename T>
3333
class IPointToPrintableValue: public IPrintable {
34-
static_assert(std::is_base_of<IPrintable, T>::value, "T must derive from xamid::helper::IPrintable.");
34+
static_assert(std::is_base_of<IPrintable, T>::value, "T must derive from xamidi::helper::IPrintable.");
3535

3636
// Abstract methods
3737
virtual const std::shared_ptr<T>& getValue() const = 0;
@@ -65,4 +65,4 @@ struct String: public IPrintable {
6565
}
6666
}
6767

68-
#endif // XAMID_HELPER_IPRINTABLE_H
68+
#endif // XAMIDI_HELPER_IPRINTABLE_H

0 commit comments

Comments
 (0)