ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libptytty/src/estl.h
(Generate patch)

Comparing libptytty/src/estl.h (file contents):
Revision 1.13 by root, Sat May 19 02:10:54 2012 UTC vs.
Revision 1.29 by sf-exg, Thu Nov 13 13:58:12 2014 UTC

… …
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
29namespace estl
30{
31#if ESTL_LARGE_MEMORY_MODEL
32 // should use size_t/ssize_t, but that's not portable enough for us
33 typedef unsigned long size_type;
34 typedef long difference_type;
35#else
36 typedef uint32_t size_type;
37 typedef int32_t difference_type;
38#endif
39
40 template<typename T>
41 struct scoped_ptr
42 {
43 T *p;
44
45 scoped_ptr () : p (0) { }
46
47 explicit
48 scoped_ptr (T *a) : p (a) { }
49
50 ~scoped_ptr ()
51 {
52 delete p;
53 }
54
55 void reset (T *a)
56 {
57 delete p;
58 p = a;
59 }
60
61 T *operator ->() const { return p; }
62 T &operator *() const { return *p; }
63
64 operator T *() { return p; }
65 T *get () const { return p; }
66
67 private:
68 scoped_ptr (const scoped_ptr &);
69 scoped_ptr &operator =(const scoped_ptr &);
70 };
71
72 template<typename T>
73 struct scoped_array
74 {
75 T *p;
76
77 scoped_array () : p (0) { }
78
79 explicit
80 scoped_array (T *a) : p (a) { }
81
82 ~scoped_array ()
83 {
84 delete [] p;
85 }
86
87 void reset (T *a)
88 {
89 delete [] p;
90 p = a;
91 }
92
93 operator T *() { return p; }
94 T *get () const { return p; }
95
96 private:
97 scoped_array (const scoped_array &);
98 scoped_array &operator =(const scoped_array &);
99 };
100}
28 101
29// original version taken from MICO, but this has been completely rewritten 102// original version taken from MICO, but this has been completely rewritten
30// known limitations w.r.t. std::vector 103// known limitations w.r.t. std::vector
31// - many methods missing 104// - many methods missing
32// - no error checking, no exceptions thrown (e.g. at()) 105// - no error checking, no exceptions thrown (e.g. at())
… …
36// - we don't care about namespaces and stupid macros the user might define 109// - we don't care about namespaces and stupid macros the user might define
37// - no bool specialisation 110// - no bool specialisation
38template<class T> 111template<class T>
39struct simplevec 112struct simplevec
40{ 113{
41#if ESTL_BIG_VECTOR 114 typedef estl::size_type size_type;
42 // shoudl use size_t/ssize_t, but that's not portable enough for us
43 typedef unsigned long size_type;
44 typedef long difference_type;
45#else
46 typedef uint32_t size_type;
47 typedef int32_t difference_type;
48#endif
49 115
50 typedef T value_type; 116 typedef T value_type;
51 typedef T *iterator; 117 typedef T *iterator;
52 typedef const T *const_iterator; 118 typedef const T *const_iterator;
53 typedef T *pointer; 119 typedef T *pointer;
… …
63 129
64 // we shamelessly optimise for "simple" types. everything 130 // we shamelessly optimise for "simple" types. everything
65 // "not simple enough" will use the slow path. 131 // "not simple enough" will use the slow path.
66 static bool is_simple_enough () 132 static bool is_simple_enough ()
67 { 133 {
68 return 1; // we are not there yet 134 #if ECB_CPP11
69 #if __cplusplus >= 201103L
70 return std::is_trivially_assignable<T, T>::value 135 return std::is_trivially_assignable<T, T>::value
71 && std::is_trivially_constructable<T>::value 136 && std::is_trivially_constructible<T>::value
72 && std::is_trivially_copyable<T>::value 137 && std::is_trivially_copyable<T>::value
73 && std::is_trivially_destructible<T>::value; 138 && std::is_trivially_destructible<T>::value;
74 #elif ECB_GCC_VERSION(4,4) 139 #elif ECB_GCC_VERSION(4,4) || ECB_CLANG_VERSION(2,8)
75 return __has_trivial_assign (T) 140 return __has_trivial_assign (T)
76 && __has_trivial_constructor (T) 141 && __has_trivial_constructor (T)
77 && __has_trivial_copy (T) 142 && __has_trivial_copy (T)
78 && __has_trivial_destructor (T); 143 && __has_trivial_destructor (T);
79 #else 144 #else
… …
83 148
84 static void construct (iterator a, size_type n = 1) 149 static void construct (iterator a, size_type n = 1)
85 { 150 {
86 if (!is_simple_enough ()) 151 if (!is_simple_enough ())
87 while (n--) 152 while (n--)
88 new (*a++) T (); 153 new (a++) T ();
89 } 154 }
90 155
91 static void destruct (iterator a, size_type n = 1) 156 static void destruct (iterator a, size_type n = 1)
92 { 157 {
93 if (!is_simple_enough ()) 158 if (!is_simple_enough ())
… …
98 template<class I> 163 template<class I>
99 static void cop_new (iterator a, I b) { new (a) T (*b); } 164 static void cop_new (iterator a, I b) { new (a) T (*b); }
100 template<class I> 165 template<class I>
101 static void cop_set (iterator a, I b) { *a = *b ; } 166 static void cop_set (iterator a, I b) { *a = *b ; }
102 167
103 static void copy_higher (iterator dst, iterator src, size_type n, void (*op)(iterator, iterator) = cop_new) 168 // 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> 169 template<class I>
113 static void copy (iterator dst, I src, size_type n, void (*op)(iterator, I) = cop_new) 170 static void copy (iterator dst, I src, size_type n, void (*op)(iterator, I))
114 { 171 {
115 while (n--) 172 while (n--)
116 op (dst++, src++); 173 op (dst++, src++);
117 } 174 }
118 175
119 static void copy (iterator dst, iterator src, size_type n, void (*op)(iterator, iterator) = cop_new) 176 static void copy (iterator dst, iterator src, size_type n, void (*op)(iterator, iterator))
120 { 177 {
121 if (is_simple_enough ()) 178 if (is_simple_enough ())
122 memcpy (dst, src, sizeof (T) * n); 179 memcpy (dst, src, sizeof (T) * n);
123 else 180 else
124 copy<iterator> (dst, src, n, op); 181 copy<iterator> (dst, src, n, op);
… …
153 dealloc (); 210 dealloc ();
154 buf = nbuf; 211 buf = nbuf;
155 } 212 }
156 213
157 construct (buf + sze, n); 214 construct (buf + sze, n);
158 copy_higher (buf + pos + n, buf + pos, sze - pos, cop_set); 215
216 iterator src = buf + pos;
217 if (is_simple_enough ())
218 memmove (src + n, src, sizeof (T) * (sze - pos));
219 else
220 for (size_type i = sze - pos; i--; )
221 cop_set (src + n + i, src + i);
222
159 sze += n; 223 sze += n;
160 } 224 }
161 225
162public: 226public:
163 size_type capacity () const { return res; } 227 size_type capacity () const { return res; }
… …
184 return; 248 return;
185 249
186 sz = good_size (sz); 250 sz = good_size (sz);
187 T *nbuf = alloc (sz); 251 T *nbuf = alloc (sz);
188 252
189 copy (nbuf, begin (), sze); 253 copy (nbuf, begin (), sze, cop_new);
190 dealloc (); 254 dealloc ();
191 255
192 buf = nbuf; 256 buf = nbuf;
193 res = sz; 257 res = sz;
194 } 258 }
… …
218 282
219 while (n--) 283 while (n--)
220 new (buf + n) T (t); 284 new (buf + n) T (t);
221 } 285 }
222 286
223 template<class I> 287 simplevec (const_iterator first, const_iterator last)
224 simplevec (I first, I last)
225 { 288 {
226 sze = res = last - first; 289 sze = res = last - first;
227 buf = alloc (sze); 290 buf = alloc (sze);
228 copy (buf, first, sze); 291 copy (buf, first, sze, cop_new);
229 } 292 }
230 293
231 simplevec (const simplevec<T> &v) 294 simplevec (const simplevec<T> &v)
232 : sze(0), res(0), buf(0) 295 : sze(0), res(0), buf(0)
233 { 296 {
234 sze = res = v.size (); 297 sze = res = v.size ();
235 buf = alloc (sze); 298 buf = alloc (sze);
236 copy (buf, v.begin (), sze); 299 copy (buf, v.begin (), sze, cop_new);
237 } 300 }
238 301
239 ~simplevec () 302 ~simplevec ()
240 { 303 {
241 dealloc (); 304 dealloc ();
… …
269 reference operator [](size_type idx) { return buf[idx]; } 332 reference operator [](size_type idx) { return buf[idx]; }
270 333
271 const_reference at (size_type idx) const { return buf [idx]; } 334 const_reference at (size_type idx) const { return buf [idx]; }
272 reference at (size_type idx) { return buf [idx]; } 335 reference at (size_type idx) { return buf [idx]; }
273 336
274 template<class I> 337 void assign (const_iterator first, const_iterator last)
275 void assign (I first, I last)
276 { 338 {
277 swap (simplevec<T> (first, last)); 339 simplevec<T> v (first, last);
340 swap (v);
278 } 341 }
279 342
280 void assign (size_type n, const T &t) 343 void assign (size_type n, const T &t)
281 { 344 {
282 swap (simplevec<T> (n, t)); 345 simplevec<T> v (n, t);
346 swap (v);
283 } 347 }
284 348
285 simplevec<T> &operator= (const simplevec<T> &v) 349 simplevec<T> &operator= (const simplevec<T> &v)
286 { 350 {
287 assign (v.begin (), v.end ()); 351 assign (v.begin (), v.end ());
… …
296 buf [at] = t; 360 buf [at] = t;
297 361
298 return buf + at; 362 return buf + at;
299 } 363 }
300 364
301 template<class I>
302 iterator insert (iterator pos, I first, I last) 365 iterator insert (iterator pos, const_iterator first, const_iterator last)
303 { 366 {
304 size_type n = last - first; 367 size_type n = last - first;
305 size_type at = pos - begin (); 368 size_type at = pos - begin ();
306 369
307 ins (pos, n); 370 ins (pos, n);
… …
320 *i++ = t; 383 *i++ = t;
321 384
322 return buf + at; 385 return buf + at;
323 } 386 }
324 387
325 void erase (iterator first, iterator last) 388 iterator erase (iterator first, iterator last)
326 { 389 {
327 size_t n = last - first; 390 size_type n = last - first;
391 size_type c = end () - last;
328 392
329 if (is_simple_enough ()) 393 if (is_simple_enough ())
330 memmove (first, last, sizeof (T) * n); 394 memmove (first, last, sizeof (T) * c);
331 else 395 else
332 copy<iterator> (first, last, n, cop_new); 396 copy (first, last, c, cop_set);
333 397
334 sze -= n; 398 sze -= n;
335 destruct (buf + sze, n); 399 destruct (buf + sze, n);
336 }
337 400
401 return first;
402 }
403
338 void erase (iterator pos) 404 iterator erase (iterator pos)
339 { 405 {
340 if (pos != end ()) 406 if (pos != end ())
341 erase (pos, pos + 1); 407 erase (pos, pos + 1);
408
409 return pos;
342 } 410 }
343}; 411};
344 412
345template<class T> 413template<class T>
346bool operator ==(const simplevec<T> &v1, const simplevec<T> &v2) 414bool operator ==(const simplevec<T> &v1, const simplevec<T> &v2)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines