1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
|
--- src/CDT.cpp.orig 2012-11-10 23:38:03.000000000 +0400
+++ src/CDT.cpp 2014-05-02 18:06:25.502508698 +0400
@@ -108,17 +108,17 @@
//
// Constructor
//
-CDT::Iterator::Iterator(CDT::Map::iterator itIMap): itMap(itIMap) { ;; }
+CDTIterator::CDTIterator(CDT::Map::iterator itIMap): itMap(itIMap) { ;; }
//
// Copy constructor
//
-CDT::Iterator::Iterator(const CDT::Iterator & oRhs): itMap(oRhs.itMap) { ;; }
+CDTIterator::CDTIterator(const CDTIterator & oRhs): itMap(oRhs.itMap) { ;; }
//
// Operator =
//
-CDT::Iterator & CDT::Iterator::operator=(const CDT::Iterator & oRhs)
+CDTIterator & CDTIterator::operator=(const CDTIterator & oRhs)
{
if (this != &oRhs) { itMap = oRhs.itMap; }
@@ -128,7 +128,7 @@
//
// Pre-increment operator ++
//
-CDT::Iterator & CDT::Iterator::operator++()
+CDTIterator & CDTIterator::operator++()
{
++itMap;
@@ -138,9 +138,9 @@
//
// Post-increment operator ++
//
-CDT::Iterator CDT::Iterator::operator++(int)
+CDTIterator CDTIterator::operator++(int)
{
- Iterator oTMP = *this;
+ CDTIterator oTMP = *this;
++itMap;
@@ -150,46 +150,46 @@
//
// Access operator
//
-STLW::pair<const STLW::string, CDT> * CDT::Iterator::operator->() { return &(*itMap); }
+STLW::pair<const STLW::string, CDT> * CDTIterator::operator->() { return &(*itMap); }
//
// Comparison operator
//
-bool CDT::Iterator::operator ==(const CDT::Iterator & oRhs) { return (itMap == oRhs.itMap); }
+bool CDTIterator::operator ==(const CDTIterator & oRhs) { return (itMap == oRhs.itMap); }
//
// Comparison operator
//
-bool CDT::Iterator::operator !=(const CDT::Iterator & oRhs) { return (itMap != oRhs.itMap); }
+bool CDTIterator::operator !=(const CDTIterator & oRhs) { return (itMap != oRhs.itMap); }
//
// Get iterator pointed to start of hash
//
-CDT::Iterator CDT::Begin()
+CDTIterator CDT::Begin()
{
if (eValueType != HASH_VAL) { throw CDTAccessException(); }
-return Iterator(u.p_data -> u.m_data -> begin());
+return CDTIterator(u.p_data -> u.m_data -> begin());
}
//
// Get iterator pointed to end of hash
//
-CDT::Iterator CDT::End()
+CDTIterator CDT::End()
{
if (eValueType != HASH_VAL) { throw CDTAccessException(); }
- return Iterator(u.p_data -> u.m_data -> end());
+ return CDTIterator(u.p_data -> u.m_data -> end());
}
//
// Find element in hash
//
-CDT::Iterator CDT::Find(const STLW::string & sKey)
+CDTIterator CDT::Find(const STLW::string & sKey)
{
if (eValueType != HASH_VAL) { throw CDTAccessException(); }
-return Iterator(u.p_data -> u.m_data -> find(sKey));
+return CDTIterator(u.p_data -> u.m_data -> find(sKey));
}
// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -200,17 +200,17 @@
//
// Copy constructor
//
-CDT::ConstIterator::ConstIterator(const CDT::ConstIterator & oRhs): itMap(oRhs.itMap) { ;; }
+CDTConstIterator::CDTConstIterator(const CDTConstIterator & oRhs): itMap(oRhs.itMap) { ;; }
//
// Type cast constructor
//
-CDT::ConstIterator::ConstIterator(const CDT::Iterator & oRhs): itMap(oRhs.itMap) { ;; }
+CDTConstIterator::CDTConstIterator(const CDTIterator & oRhs): itMap(oRhs.itMap) { ;; }
//
// Operator =
//
-CDT::ConstIterator & CDT::ConstIterator::operator=(const ConstIterator & oRhs)
+CDTConstIterator & CDTConstIterator::operator=(const CDTConstIterator & oRhs)
{
if (this != &oRhs) { itMap = oRhs.itMap; }
@@ -220,7 +220,7 @@
//
// Operator =
//
-CDT::ConstIterator & CDT::ConstIterator::operator=(const CDT::Iterator & oRhs)
+CDTConstIterator & CDTConstIterator::operator=(const CDTIterator & oRhs)
{
itMap = oRhs.itMap;
@@ -230,7 +230,7 @@
//
// Pre-increment operator ++
//
-CDT::ConstIterator & CDT::ConstIterator::operator++()
+CDTConstIterator & CDTConstIterator::operator++()
{
++itMap;
@@ -240,9 +240,9 @@
//
// Post-increment operator ++
//
-CDT::ConstIterator CDT::ConstIterator::operator++(int)
+CDTConstIterator CDTConstIterator::operator++(int)
{
- ConstIterator oTMP = *this;
+ CDTConstIterator oTMP = *this;
++itMap;
@@ -252,46 +252,46 @@
//
// Access operator
//
-const STLW::pair<const STLW::string, CDT> * CDT::ConstIterator::operator->() const { return &(*itMap); }
+const STLW::pair<const STLW::string, CDT> * CDTConstIterator::operator->() const { return &(*itMap); }
//
// Comparison operator
//
-bool CDT::ConstIterator::operator ==(const CDT::ConstIterator & oRhs) const { return (itMap == oRhs.itMap); }
+bool CDTConstIterator::operator ==(const CDTConstIterator & oRhs) const { return (itMap == oRhs.itMap); }
//
// Comparison operator
//
-bool CDT::ConstIterator::operator !=(const CDT::ConstIterator & oRhs) const { return (itMap != oRhs.itMap); }
+bool CDTConstIterator::operator !=(const CDTConstIterator & oRhs) const { return (itMap != oRhs.itMap); }
//
// Get constant iterator pointed to start of hash
//
-CDT::ConstIterator CDT::Begin() const
+CDTConstIterator CDT::Begin() const
{
if (eValueType != HASH_VAL) { throw CDTAccessException(); }
-return ConstIterator(u.p_data -> u.m_data -> begin());
+return CDTConstIterator(u.p_data -> u.m_data -> begin());
}
//
// Get constant iterator pointed to end of hash
//
-CDT::ConstIterator CDT::End() const
+CDTConstIterator CDT::End() const
{
if (eValueType != HASH_VAL) { throw CDTAccessException(); }
-return ConstIterator(u.p_data -> u.m_data -> end());
+return CDTConstIterator(u.p_data -> u.m_data -> end());
}
//
// Find element in hash
//
-CDT::ConstIterator CDT::Find(const STLW::string & sKey) const
+CDTConstIterator CDT::Find(const STLW::string & sKey) const
{
if (eValueType != HASH_VAL) { throw CDTAccessException(); }
-return ConstIterator(u.p_data -> u.m_data -> find(sKey));
+return CDTConstIterator(u.p_data -> u.m_data -> find(sKey));
}
// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -4138,7 +4138,7 @@
case HASH_VAL:
{
- ConstIterator itHash = oData.Begin();
+ CDTConstIterator itHash = oData.Begin();
if (itHash == oData.End())
{
if (!bGlobalScope) { sResult += "{ }"; }
|
