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
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
|
--- include/CDT.hpp.orig 2012-11-11 01:45:43.000000000 +0400
+++ include/CDT.hpp 2014-05-02 18:06:25.481307400 +0400
@@ -48,13 +48,16 @@
#define C_MAX_SPRINTF_LENGTH 128
+class CTPP2DECL CDTConstIterator;
+class CTPP2DECL CDTIterator;
+
/**
@class CDT CDT.hpp <CDT.hpp>
@brief Common Data Type
*/
class CTPP2DECL CDT
{
-private:
+public:
/**
@var typedef STLW::string<CDT> String
@brief internal string definition
@@ -72,7 +75,7 @@
@brief internal hash definition
*/
typedef STLW::map<String, CDT> Map;
-public:
+
/**
@enum eValType CDT.hpp <CDT.hpp>
@brief Describes type of stored value
@@ -1768,172 +1771,39 @@
virtual ~SortingComparator() throw();
};
- // FWD
- class CTPP2DECL ConstIterator;
-
- /**
- @class Iterator CDT.hpp <CDT.hpp>
- @brief CDT[HASH] forward iterator
- */
- class CTPP2DECL Iterator
- {
- private:
- friend class CDT;
- friend class ConstIterator;
-
- /** Hash iterator */
- CDT::Map::iterator itMap;
-
- /**
- @brief Constructor
- @param itIMap - map iterator
- */
- Iterator(CDT::Map::iterator itIMap);
- public:
- /**
- @brief Copy constructor
- @param oRhs - object to copy
- */
- Iterator(const Iterator & oRhs);
-
- /**
- @brief Operator =
- @param oRhs - object to copy
- */
- Iterator & operator=(const Iterator & oRhs);
-
- /**
- @brief Pre-increment operator ++
- */
- Iterator & operator++();
-
- /**
- @brief Post-increment operator ++
- */
- Iterator operator++(int);
-
- /**
- @brief Access operator
- @return Pair of key => value
- */
- STLW::pair<const STLW::string, CDT> * operator->();
-
- /**
- @brief Comparison operator
- @param oRhs - object to compare
- @return true if objects are equal
- */
- bool operator ==(const Iterator & oRhs);
-
- /**
- @brief Comparison operator
- @param oRhs - object to compare
- @return true if objects are NOT equal
- */
- bool operator !=(const Iterator & oRhs);
- };
-
/**
@brief Get iterator pointed to start of hash
*/
- Iterator Begin();
+ CDTIterator Begin();
/**
@brief Get iterator pointed to end of hash
*/
- Iterator End();
+ CDTIterator End();
/**
@brief Find element in hash
@param sKey - element name
@return Iterator pointed to element or to end of hash if nothing found
*/
- Iterator Find(const STLW::string & sKey);
-
- /**
- @class ConstIterator CDT.hpp <CDT.hpp>
- @brief CDT[HASH] forward constant iterator
- */
- class CTPP2DECL ConstIterator
- {
- private:
- friend class CDT;
-
- /** Hash iterator */
- CDT::Map::const_iterator itMap;
-
- public:
- /**
- @brief Copy constructor
- @param oRhs - object to copy
- */
- ConstIterator(const ConstIterator & oRhs);
-
- /**
- @brief Type cast constructor
- @param oRhs - object to copy
- */
- ConstIterator(const Iterator & oRhs);
-
- /**
- @brief Operator =
- @param oRhs - object to copy
- */
- ConstIterator & operator=(const ConstIterator & oRhs);
-
- /**
- @brief Operator =
- @param oRhs - object to copy
- */
- ConstIterator & operator=(const Iterator & oRhs);
-
- /**
- @brief Pre-increment operator ++
- */
- ConstIterator & operator++();
-
- /**
- @brief Post-increment operator ++
- */
- ConstIterator operator++(int);
-
- /**
- @brief Access operator
- @return Pair of key => value
- */
- const STLW::pair<const STLW::string, CDT> * operator->() const;
-
- /**
- @brief Comparison operator
- @param oRhs - object to compare
- @return true if objects are equal
- */
- bool operator ==(const ConstIterator & oRhs) const;
-
- /**
- @brief Comparison operator
- @param oRhs - object to compare
- @return true if objects are NOT equal
- */
- bool operator !=(const ConstIterator & oRhs) const;
- };
+ CDTIterator Find(const STLW::string & sKey);
/**
@brief Get constant iterator pointed to start of hash
*/
- ConstIterator Begin() const;
+ CDTConstIterator Begin() const;
/**
@brief Get constant iterator pointed to end of hash
*/
- ConstIterator End() const;
+ CDTConstIterator End() const;
/**
@brief Find element in hash
@param sKey - element name
@return Iterator pointed to element or to end of hash if nothing found
*/
- ConstIterator Find(const STLW::string & sKey) const;
+ CDTConstIterator Find(const STLW::string & sKey) const;
/**
@brief Try to cast value to integer or to IEEE floating point value
@@ -2009,6 +1879,139 @@
};
+
+/**
+ @class CDTIterator CDT.hpp <CDT.hpp>
+ @brief CDT[HASH] forward iterator
+*/
+class CTPP2DECL CDTIterator
+{
+private:
+ friend class CDT;
+ friend class CDTConstIterator;
+
+ /** Hash iterator */
+ CDT::Map::iterator itMap;
+
+ /**
+ @brief Constructor
+ @param itIMap - map iterator
+ */
+ CDTIterator(CDT::Map::iterator itIMap);
+public:
+ /**
+ @brief Copy constructor
+ @param oRhs - object to copy
+ */
+ CDTIterator(const CDTIterator & oRhs);
+
+ /**
+ @brief Operator =
+ @param oRhs - object to copy
+ */
+ CDTIterator & operator=(const CDTIterator & oRhs);
+
+ /**
+ @brief Pre-increment operator ++
+ */
+ CDTIterator & operator++();
+
+ /**
+ @brief Post-increment operator ++
+ */
+ CDTIterator operator++(int);
+
+ /**
+ @brief Access operator
+ @return Pair of key => value
+ */
+ STLW::pair<const STLW::string, CDT> * operator->();
+
+ /**
+ @brief Comparison operator
+ @param oRhs - object to compare
+ @return true if objects are equal
+ */
+ bool operator ==(const CDTIterator & oRhs);
+
+ /**
+ @brief Comparison operator
+ @param oRhs - object to compare
+ @return true if objects are NOT equal
+ */
+ bool operator !=(const CDTIterator & oRhs);
+};
+
+
+/**
+ @class CDTConstIterator CDT.hpp <CDT.hpp>
+ @brief CDT[HASH] forward constant iterator
+*/
+class CTPP2DECL CDTConstIterator
+{
+private:
+ friend class CDT;
+
+ /** Hash iterator */
+ CDT::Map::const_iterator itMap;
+
+public:
+ /**
+ @brief Copy constructor
+ @param oRhs - object to copy
+ */
+ CDTConstIterator(const CDTConstIterator & oRhs);
+
+ /**
+ @brief Type cast constructor
+ @param oRhs - object to copy
+ */
+ CDTConstIterator(const CDTIterator & oRhs);
+
+ /**
+ @brief Operator =
+ @param oRhs - object to copy
+ */
+ CDTConstIterator & operator=(const CDTConstIterator & oRhs);
+
+ /**
+ @brief Operator =
+ @param oRhs - object to copy
+ */
+ CDTConstIterator & operator=(const CDTIterator & oRhs);
+
+ /**
+ @brief Pre-increment operator ++
+ */
+ CDTConstIterator & operator++();
+
+ /**
+ @brief Post-increment operator ++
+ */
+ CDTConstIterator operator++(int);
+
+ /**
+ @brief Access operator
+ @return Pair of key => value
+ */
+ const STLW::pair<const STLW::string, CDT> * operator->() const;
+
+ /**
+ @brief Comparison operator
+ @param oRhs - object to compare
+ @return true if objects are equal
+ */
+ bool operator ==(const CDTConstIterator & oRhs) const;
+
+ /**
+ @brief Comparison operator
+ @param oRhs - object to compare
+ @return true if objects are NOT equal
+ */
+ bool operator !=(const CDTConstIterator & oRhs) const;
+};
+
+
// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// Realization
|
