| … | |
… | |
| 20 | return first; |
20 | return first; |
| 21 | } |
21 | } |
| 22 | |
22 | |
| 23 | #include <new> |
23 | #include <new> |
| 24 | |
24 | |
| 25 | #if __cplusplus >= 201103L |
25 | #if ECB_CPP11 |
| 26 | #include <type_traits> |
26 | #include <type_traits> |
| 27 | #endif |
27 | #endif |
| 28 | |
28 | |
| 29 | // original version taken from MICO, but this has been completely rewritten |
29 | // original version taken from MICO, but this has been completely rewritten |
| 30 | // known limitations w.r.t. std::vector |
30 | // known limitations w.r.t. std::vector |
| … | |
… | |
| 37 | // - no bool specialisation |
37 | // - no bool specialisation |
| 38 | template<class T> |
38 | template<class T> |
| 39 | struct simplevec |
39 | struct simplevec |
| 40 | { |
40 | { |
| 41 | #if ESTL_BIG_VECTOR |
41 | #if ESTL_BIG_VECTOR |
| 42 | // shoudl use size_t/ssize_t, but that's not portable enough for us |
42 | // should use size_t/ssize_t, but that's not portable enough for us |
| 43 | typedef unsigned long size_type; |
43 | typedef unsigned long size_type; |
| 44 | typedef long difference_type; |
44 | typedef long difference_type; |
| 45 | #else |
45 | #else |
| 46 | typedef uint32_t size_type; |
46 | typedef uint32_t size_type; |
| 47 | typedef int32_t difference_type; |
47 | typedef int32_t difference_type; |
| … | |
… | |
| 63 | |
63 | |
| 64 | // we shamelessly optimise for "simple" types. everything |
64 | // we shamelessly optimise for "simple" types. everything |
| 65 | // "not simple enough" will use the slow path. |
65 | // "not simple enough" will use the slow path. |
| 66 | static bool is_simple_enough () |
66 | static bool is_simple_enough () |
| 67 | { |
67 | { |
| 68 | return 1; // we are not there yet |
68 | #if ECB_CPP11 |
| 69 | #if __cplusplus >= 201103L |
|
|
| 70 | return std::is_trivially_assignable<T, T>::value |
69 | return std::is_trivially_assignable<T, T>::value |
| 71 | && std::is_trivially_constructable<T>::value |
70 | && std::is_trivially_constructable<T>::value |
| 72 | && std::is_trivially_copyable<T>::value |
71 | && std::is_trivially_copyable<T>::value |
| 73 | && std::is_trivially_destructible<T>::value; |
72 | && std::is_trivially_destructible<T>::value; |
| 74 | #elif ECB_GCC_VERSION(4,4) |
73 | #elif ECB_GCC_VERSION(4,4) |
| … | |
… | |
| 83 | |
82 | |
| 84 | static void construct (iterator a, size_type n = 1) |
83 | static void construct (iterator a, size_type n = 1) |
| 85 | { |
84 | { |
| 86 | if (!is_simple_enough ()) |
85 | if (!is_simple_enough ()) |
| 87 | while (n--) |
86 | while (n--) |
| 88 | new (*a++) T (); |
87 | new (a++) T (); |
| 89 | } |
88 | } |
| 90 | |
89 | |
| 91 | static void destruct (iterator a, size_type n = 1) |
90 | static void destruct (iterator a, size_type n = 1) |
| 92 | { |
91 | { |
| 93 | if (!is_simple_enough ()) |
92 | if (!is_simple_enough ()) |
| … | |
… | |
| 98 | template<class I> |
97 | template<class I> |
| 99 | static void cop_new (iterator a, I b) { new (a) T (*b); } |
98 | static void cop_new (iterator a, I b) { new (a) T (*b); } |
| 100 | template<class I> |
99 | template<class I> |
| 101 | static void cop_set (iterator a, I b) { *a = *b ; } |
100 | static void cop_set (iterator a, I b) { *a = *b ; } |
| 102 | |
101 | |
| 103 | static void copy_higher (iterator dst, iterator src, size_type n, void (*op)(iterator, iterator) = cop_new) |
102 | // MUST copy forwards |
| 104 | { |
|
|
| 105 | if (is_simple_enough ()) |
|
|
| 106 | memmove (dst, src, sizeof (T) * n); |
|
|
| 107 | else |
|
|
| 108 | while (n--) |
|
|
| 109 | op (dst + n, src + n); |
|
|
| 110 | } |
|
|
| 111 | |
|
|
| 112 | template<class I> |
103 | template<class I> |
| 113 | static void copy (iterator dst, I src, size_type n, void (*op)(iterator, I) = cop_new) |
104 | static void copy (iterator dst, I src, size_type n, void (*op)(iterator, I)) |
| 114 | { |
105 | { |
| 115 | while (n--) |
106 | while (n--) |
| 116 | op (dst++, src++); |
107 | op (dst++, src++); |
| 117 | } |
108 | } |
| 118 | |
109 | |
| 119 | static void copy (iterator dst, iterator src, size_type n, void (*op)(iterator, iterator) = cop_new) |
110 | static void copy (iterator dst, iterator src, size_type n, void (*op)(iterator, iterator)) |
| 120 | { |
111 | { |
| 121 | if (is_simple_enough ()) |
112 | if (is_simple_enough ()) |
| 122 | memcpy (dst, src, sizeof (T) * n); |
113 | memcpy (dst, src, sizeof (T) * n); |
| 123 | else |
114 | else |
| 124 | copy<iterator> (dst, src, n, op); |
115 | copy<iterator> (dst, src, n, op); |
| … | |
… | |
| 153 | dealloc (); |
144 | dealloc (); |
| 154 | buf = nbuf; |
145 | buf = nbuf; |
| 155 | } |
146 | } |
| 156 | |
147 | |
| 157 | construct (buf + sze, n); |
148 | construct (buf + sze, n); |
| 158 | copy_higher (buf + pos + n, buf + pos, sze - pos, cop_set); |
149 | |
|
|
150 | iterator src = buf + pos; |
|
|
151 | if (is_simple_enough ()) |
|
|
152 | memmove (src + n, src, sizeof (T) * (sze - pos)); |
|
|
153 | else |
|
|
154 | for (size_type i = sze - pos; i--; ) |
|
|
155 | cop_set (src + n + i, src + i); |
|
|
156 | |
| 159 | sze += n; |
157 | sze += n; |
| 160 | } |
158 | } |
| 161 | |
159 | |
| 162 | public: |
160 | public: |
| 163 | size_type capacity () const { return res; } |
161 | size_type capacity () const { return res; } |
| … | |
… | |
| 184 | return; |
182 | return; |
| 185 | |
183 | |
| 186 | sz = good_size (sz); |
184 | sz = good_size (sz); |
| 187 | T *nbuf = alloc (sz); |
185 | T *nbuf = alloc (sz); |
| 188 | |
186 | |
| 189 | copy (nbuf, begin (), sze); |
187 | copy (nbuf, begin (), sze, cop_new); |
| 190 | dealloc (); |
188 | dealloc (); |
| 191 | |
189 | |
| 192 | buf = nbuf; |
190 | buf = nbuf; |
| 193 | res = sz; |
191 | res = sz; |
| 194 | } |
192 | } |
| … | |
… | |
| 218 | |
216 | |
| 219 | while (n--) |
217 | while (n--) |
| 220 | new (buf + n) T (t); |
218 | new (buf + n) T (t); |
| 221 | } |
219 | } |
| 222 | |
220 | |
| 223 | template<class I> |
221 | simplevec (const_iterator first, const_iterator last) |
| 224 | simplevec (I first, I last) |
|
|
| 225 | { |
222 | { |
| 226 | sze = res = last - first; |
223 | sze = res = last - first; |
| 227 | buf = alloc (sze); |
224 | buf = alloc (sze); |
| 228 | copy (buf, first, sze); |
225 | copy (buf, first, sze, cop_new); |
| 229 | } |
226 | } |
| 230 | |
227 | |
| 231 | simplevec (const simplevec<T> &v) |
228 | simplevec (const simplevec<T> &v) |
| 232 | : sze(0), res(0), buf(0) |
229 | : sze(0), res(0), buf(0) |
| 233 | { |
230 | { |
| 234 | sze = res = v.size (); |
231 | sze = res = v.size (); |
| 235 | buf = alloc (sze); |
232 | buf = alloc (sze); |
| 236 | copy (buf, v.begin (), sze); |
233 | copy (buf, v.begin (), sze, cop_new); |
| 237 | } |
234 | } |
| 238 | |
235 | |
| 239 | ~simplevec () |
236 | ~simplevec () |
| 240 | { |
237 | { |
| 241 | dealloc (); |
238 | dealloc (); |
| … | |
… | |
| 269 | reference operator [](size_type idx) { return buf[idx]; } |
266 | reference operator [](size_type idx) { return buf[idx]; } |
| 270 | |
267 | |
| 271 | const_reference at (size_type idx) const { return buf [idx]; } |
268 | const_reference at (size_type idx) const { return buf [idx]; } |
| 272 | reference at (size_type idx) { return buf [idx]; } |
269 | reference at (size_type idx) { return buf [idx]; } |
| 273 | |
270 | |
| 274 | template<class I> |
271 | void assign (const_iterator first, const_iterator last) |
| 275 | void assign (I first, I last) |
|
|
| 276 | { |
272 | { |
| 277 | swap (simplevec<T> (first, last)); |
273 | simplevec<T> v (first, last); |
|
|
274 | swap (v); |
| 278 | } |
275 | } |
| 279 | |
276 | |
| 280 | void assign (size_type n, const T &t) |
277 | void assign (size_type n, const T &t) |
| 281 | { |
278 | { |
| 282 | swap (simplevec<T> (n, t)); |
279 | simplevec<T> v (n, t); |
|
|
280 | swap (v); |
| 283 | } |
281 | } |
| 284 | |
282 | |
| 285 | simplevec<T> &operator= (const simplevec<T> &v) |
283 | simplevec<T> &operator= (const simplevec<T> &v) |
| 286 | { |
284 | { |
| 287 | assign (v.begin (), v.end ()); |
285 | assign (v.begin (), v.end ()); |
| … | |
… | |
| 296 | buf [at] = t; |
294 | buf [at] = t; |
| 297 | |
295 | |
| 298 | return buf + at; |
296 | return buf + at; |
| 299 | } |
297 | } |
| 300 | |
298 | |
| 301 | template<class I> |
|
|
| 302 | iterator insert (iterator pos, I first, I last) |
299 | iterator insert (iterator pos, const_iterator first, const_iterator last) |
| 303 | { |
300 | { |
| 304 | size_type n = last - first; |
301 | size_type n = last - first; |
| 305 | size_type at = pos - begin (); |
302 | size_type at = pos - begin (); |
| 306 | |
303 | |
| 307 | ins (pos, n); |
304 | ins (pos, n); |
| … | |
… | |
| 320 | *i++ = t; |
317 | *i++ = t; |
| 321 | |
318 | |
| 322 | return buf + at; |
319 | return buf + at; |
| 323 | } |
320 | } |
| 324 | |
321 | |
| 325 | void erase (iterator first, iterator last) |
322 | iterator erase (iterator first, iterator last) |
| 326 | { |
323 | { |
| 327 | size_t n = last - first; |
324 | size_type n = last - first; |
|
|
325 | size_type c = end () - last; |
| 328 | |
326 | |
| 329 | if (is_simple_enough ()) |
327 | if (is_simple_enough ()) |
| 330 | memmove (first, last, sizeof (T) * n); |
328 | memmove (first, last, sizeof (T) * c); |
| 331 | else |
329 | else |
| 332 | copy<iterator> (first, last, n, cop_new); |
330 | copy (first, last, c, cop_set); |
| 333 | |
331 | |
| 334 | sze -= n; |
332 | sze -= n; |
| 335 | destruct (buf + sze, n); |
333 | destruct (buf + sze, n); |
| 336 | } |
|
|
| 337 | |
334 | |
|
|
335 | return first; |
|
|
336 | } |
|
|
337 | |
| 338 | void erase (iterator pos) |
338 | iterator erase (iterator pos) |
| 339 | { |
339 | { |
| 340 | if (pos != end ()) |
340 | if (pos != end ()) |
| 341 | erase (pos, pos + 1); |
341 | erase (pos, pos + 1); |
|
|
342 | |
|
|
343 | return pos; |
| 342 | } |
344 | } |
| 343 | }; |
345 | }; |
| 344 | |
346 | |
| 345 | template<class T> |
347 | template<class T> |
| 346 | bool operator ==(const simplevec<T> &v1, const simplevec<T> &v2) |
348 | bool operator ==(const simplevec<T> &v1, const simplevec<T> &v2) |
