ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtutil.h
(Generate patch)

Comparing rxvt-unicode/src/rxvtutil.h (file contents):
Revision 1.4 by root, Thu Sep 2 07:44:40 2004 UTC vs.
Revision 1.8 by root, Sun Jan 16 15:59:45 2005 UTC

… …
16 16
17template<typename T, typename U> 17template<typename T, typename U>
18static inline T min (T a, U b) { return a < b ? a : (T)b; } 18static inline T min (T a, U b) { return a < b ? a : (T)b; }
19template<typename T, typename U> 19template<typename T, typename U>
20static inline T max (T a, U b) { return a > b ? a : (T)b; } 20static inline T max (T a, U b) { return a > b ? a : (T)b; }
21template<typename T>
22static inline void swap (T& a, T& b) { T t=a; a=b; b=t; }
23
21 24
22struct zero_initialized { 25struct zero_initialized {
23 void *operator new (size_t s); 26 void *operator new (size_t s);
24 void operator delete (void *p, size_t s); 27 void operator delete (void *p, size_t s);
25}; 28};
… …
40 T *_buf; 43 T *_buf;
41 44
42public: 45public:
43 const_iterator begin () const 46 const_iterator begin () const
44 { 47 {
45 return &_buf[0]; 48 return &_buf[0];
46 } 49 }
47 iterator begin () 50 iterator begin ()
48 { 51 {
49 return &_buf[0]; 52 return &_buf[0];
50 } 53 }
51 const_iterator end () const 54 const_iterator end () const
52 { 55 {
53 return &_buf[_last]; 56 return &_buf[_last];
54 } 57 }
55 iterator end () 58 iterator end ()
56 { 59 {
57 return &_buf[_last]; 60 return &_buf[_last];
58 } 61 }
59 size_type capacity () const 62 size_type capacity () const
60 { 63 {
61 return _size; 64 return _size;
62 } 65 }
63 size_type size () const 66 size_type size () const
64 { 67 {
65 return _last; 68 return _last;
66 } 69 }
67 70
68private: 71private:
69 static T *alloc (size_type n) 72 static T *alloc (size_type n)
70 { 73 {
71 return (T *)::operator new ((size_t) (n * sizeof (T))); 74 return (T *)::operator new ((size_t) (n * sizeof (T)));
72 } 75 }
73 static void dealloc (T *buf) 76 static void dealloc (T *buf)
74 { 77 {
75 if (buf) 78 if (buf)
76 ::operator delete (buf); 79 ::operator delete (buf);
77 } 80 }
78 81
79 void reserve (iterator where, size_type n) 82 void reserve (iterator where, size_type n)
80 { 83 {
81 if (_last + n <= _size) { 84 if (_last + n <= _size) {
82 memmove (where+n, where, (end ()-where)*sizeof (T)); 85 memmove (where+n, where, (end ()-where)*sizeof (T));
83 } else { 86 } else {
84 size_type sz = _last+n; 87 size_type sz = _last+n;
85 sz = (_size == 0) ? max (sz, 5) : max (sz, 2*_size); 88 sz = (_size == 0) ? max (sz, 5) : max (sz, 2*_size);
86 T *nbuf = alloc (sz); 89 T *nbuf = alloc (sz);
87 if (_buf) { 90 if (_buf) {
88 memcpy (nbuf, begin (), (where-begin ())*sizeof (T)); 91 memcpy (nbuf, begin (), (where-begin ())*sizeof (T));
89 memcpy (nbuf + (where-begin ()) + n, where, 92 memcpy (nbuf + (where-begin ()) + n, where,
90 (end ()-where)*sizeof (T)); 93 (end ()-where)*sizeof (T));
91 dealloc (_buf); 94 dealloc (_buf);
92 } 95 }
93 _buf = nbuf; 96 _buf = nbuf;
94 _size = sz; 97 _size = sz;
95 } 98 }
96 } 99 }
97 100
98public: 101public:
99 void reserve (size_type sz) 102 void reserve (size_type sz)
100 { 103 {
101 if (_size < sz) { 104 if (_size < sz) {
102 sz = (_size == 0) ? max (sz, 5) : max (sz, 2*_size); 105 sz = (_size == 0) ? max (sz, 5) : max (sz, 2*_size);
103 T *nbuf = alloc (sz); 106 T *nbuf = alloc (sz);
104 if (_buf) { 107 if (_buf) {
105 memcpy (nbuf, begin (), size ()*sizeof (T)); 108 memcpy (nbuf, begin (), size ()*sizeof (T));
106 dealloc (_buf); 109 dealloc (_buf);
107 } 110 }
108 _buf = nbuf; 111 _buf = nbuf;
109 _size = sz; 112 _size = sz;
110 } 113 }
111 } 114 }
112 simplevec () 115 simplevec ()
113 : _last(0), _size(0), _buf(0) 116 : _last(0), _size(0), _buf(0)
114 { 117 {
115 } 118 }
116 simplevec (size_type n, const T& t = T ()) 119 simplevec (size_type n, const T& t = T ())
117 : _last(0), _size(0), _buf(0) 120 : _last(0), _size(0), _buf(0)
118 { 121 {
119 insert (begin (), n, t); 122 insert (begin (), n, t);
120 } 123 }
121 simplevec (const_iterator first, const_iterator last) 124 simplevec (const_iterator first, const_iterator last)
122 : _last(0), _size(0), _buf(0) 125 : _last(0), _size(0), _buf(0)
123 { 126 {
124 insert (begin (), first, last); 127 insert (begin (), first, last);
125 } 128 }
126 simplevec (const simplevec<T> &v) 129 simplevec (const simplevec<T> &v)
127 : _last(0), _size(0), _buf(0) 130 : _last(0), _size(0), _buf(0)
128 { 131 {
129 reserve (v._last); 132 reserve (v._last);
130 memcpy (_buf, v.begin (), v.size ()*sizeof (T)); 133 memcpy (_buf, v.begin (), v.size ()*sizeof (T));
131 _last = v._last; 134 _last = v._last;
132 } 135 }
133 simplevec<T> &operator= (const simplevec<T> &v) 136 simplevec<T> &operator= (const simplevec<T> &v)
134 { 137 {
135 if (this != &v) { 138 if (this != &v) {
136 _last = 0; 139 _last = 0;
137 reserve (v._last); 140 reserve (v._last);
138 memcpy (_buf, v.begin (), v.size ()*sizeof (T)); 141 memcpy (_buf, v.begin (), v.size ()*sizeof (T));
139 _last = v._last; 142 _last = v._last;
140 } 143 }
141 return *this; 144 return *this;
142 } 145 }
143 ~simplevec () 146 ~simplevec ()
144 { 147 {
145 dealloc (_buf); 148 dealloc (_buf);
146 } 149 }
147 const T &front () const 150 const T &front () const
148 { 151 {
149 //ministl_assert (size () > 0); 152 //ministl_assert (size () > 0);
150 return _buf[0]; 153 return _buf[0];
151 } 154 }
152 T &front () 155 T &front ()
153 { 156 {
154 //ministl_assert (size () > 0); 157 //ministl_assert (size () > 0);
155 return _buf[0]; 158 return _buf[0];
156 } 159 }
157 const T &back () const 160 const T &back () const
158 { 161 {
159 //ministl_assert (size () > 0); 162 //ministl_assert (size () > 0);
160 return _buf[_last-1]; 163 return _buf[_last-1];
161 } 164 }
162 T &back () 165 T &back ()
163 { 166 {
164 //ministl_assert (size () > 0); 167 //ministl_assert (size () > 0);
165 return _buf[_last-1]; 168 return _buf[_last-1];
166 } 169 }
167 bool empty () const 170 bool empty () const
168 { 171 {
169 return _last == 0; 172 return _last == 0;
170 } 173 }
171 void clear () 174 void clear ()
172 { 175 {
173 _last = 0; 176 _last = 0;
174 } 177 }
175 void push_back (const T &t) 178 void push_back (const T &t)
176 { 179 {
177 reserve (_last+1); 180 reserve (_last+1);
178 *end () = t; 181 *end () = t;
179 ++_last; 182 ++_last;
180 } 183 }
181 void push_back (T &t) 184 void push_back (T &t)
182 { 185 {
183 reserve (_last+1); 186 reserve (_last+1);
184 *end () = t; 187 *end () = t;
185 ++_last; 188 ++_last;
186 } 189 }
187 void pop_back () 190 void pop_back ()
188 { 191 {
189 //ministl_assert (size () > 0); 192 //ministl_assert (size () > 0);
190 --_last; 193 --_last;
191 } 194 }
192 const T &operator[] (size_type idx) const 195 const T &operator[] (size_type idx) const
193 { 196 {
194 //ministl_assert (idx < size ()); 197 //ministl_assert (idx < size ());
195 return _buf[idx]; 198 return _buf[idx];
196 } 199 }
197 T &operator[] (size_type idx) 200 T &operator[] (size_type idx)
198 { 201 {
199 //ministl_assert (idx < size ()); 202 //ministl_assert (idx < size ());
200 return _buf[idx]; 203 return _buf[idx];
201 } 204 }
202 iterator insert (iterator pos, const T &t) 205 iterator insert (iterator pos, const T &t)
203 { 206 {
204 //ministl_assert (pos <= end ()); 207 //ministl_assert (pos <= end ());
205 long at = pos - begin (); 208 long at = pos - begin ();
206 reserve (pos, 1); 209 reserve (pos, 1);
207 pos = begin ()+at; 210 pos = begin ()+at;
208 *pos = t; 211 *pos = t;
209 ++_last; 212 ++_last;
210 return pos; 213 return pos;
211 } 214 }
212 iterator insert (iterator pos, const_iterator first, const_iterator last) 215 iterator insert (iterator pos, const_iterator first, const_iterator last)
213 { 216 {
214 //ministl_assert (pos <= end ()); 217 //ministl_assert (pos <= end ());
215 long n = last - first; 218 long n = last - first;
216 long at = pos - begin (); 219 long at = pos - begin ();
217 if (n > 0) { 220 if (n > 0) {
218 reserve (pos, n); 221 reserve (pos, n);
219 pos = begin ()+at; 222 pos = begin ()+at;
220 memcpy (pos, first, (last-first)*sizeof (T)); 223 memcpy (pos, first, (last-first)*sizeof (T));
221 _last += n; 224 _last += n;
222 } 225 }
223 return pos; 226 return pos;
224 } 227 }
225 iterator insert (iterator pos, size_type n, const T &t) 228 iterator insert (iterator pos, size_type n, const T &t)
226 { 229 {
227 //ministl_assert (pos <= end ()); 230 //ministl_assert (pos <= end ());
228 long at = pos - begin (); 231 long at = pos - begin ();
229 if (n > 0) { 232 if (n > 0) {
230 reserve (pos, n); 233 reserve (pos, n);
231 pos = begin ()+at; 234 pos = begin ()+at;
232 for (int i = 0; i < n; ++i) 235 for (int i = 0; i < n; ++i)
233 pos[i] = t; 236 pos[i] = t;
234 _last += n; 237 _last += n;
235 } 238 }
236 return pos; 239 return pos;
237 } 240 }
238 void erase (iterator first, iterator last) 241 void erase (iterator first, iterator last)
239 { 242 {
240 if (last != first) { 243 if (last != first) {
241 memmove (first, last, (end ()-last)*sizeof (T)); 244 memmove (first, last, (end ()-last)*sizeof (T));
242 _last -= last - first; 245 _last -= last - first;
243 } 246 }
244 } 247 }
245 void erase (iterator pos) 248 void erase (iterator pos)
246 { 249 {
247 if (pos != end ()) { 250 if (pos != end ()) {
248 memmove (pos, pos+1, (end ()- (pos+1))*sizeof (T)); 251 memmove (pos, pos+1, (end ()- (pos+1))*sizeof (T));
249 --_last; 252 --_last;
250 } 253 }
254 }
255 void swap (simplevec<T> &t)
256 {
257 ::swap(_last, t._last);
258 ::swap(_size, t._size);
259 ::swap(_buf, t._buf);
251 } 260 }
252}; 261};
253 262
254template<class T> 263template<class T>
255bool operator== (const simplevec<T> &v1, const simplevec<T> &v2) 264bool operator== (const simplevec<T> &v1, const simplevec<T> &v2)
256{ 265{
257 if (v1.size () != v2.size ()) 266 if (v1.size () != v2.size ())
258 return false; 267 return false;
259 return !v1.size () || !memcmp (&v1[0], &v2[0], v1.size ()*sizeof (T)); 268 return !v1.size () || !memcmp (&v1[0], &v2[0], v1.size ()*sizeof (T));
260} 269}
261 270
262template<class T> 271template<class T>
263bool operator< (const simplevec<T> &v1, const simplevec<T> &v2) 272bool operator< (const simplevec<T> &v1, const simplevec<T> &v2)
264{ 273{
265 unsigned long minlast = min (v1.size (), v2.size ()); 274 unsigned long minlast = min (v1.size (), v2.size ());
266 for (unsigned long i = 0; i < minlast; ++i) { 275 for (unsigned long i = 0; i < minlast; ++i) {
267 if (v1[i] < v2[i]) 276 if (v1[i] < v2[i])
268 return true; 277 return true;
269 if (v2[i] < v1[i]) 278 if (v2[i] < v1[i])
270 return false; 279 return false;
271 } 280 }
272 return v1.size () < v2.size (); 281 return v1.size () < v2.size ();
273} 282}
274 283
275 284

Diff Legend

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