projects/ddmd: dmd/Array.d annotate

annotate dmd/Array.d @ 114:e28b18c23469

added a module dmd.common for commonly used stuff it currently holds code for consistency checking of predefined versions also added a VisualD project file

author	Trass3r
date	Wed, 01 Sep 2010 18:21:58 +0200
parents	3482c73a991b
children	347de076ad34

rev	line source
0 10317f0c89a5 Initial commit korDen parents: diff changeset	1 module dmd.Array;
10317f0c89a5 Initial commit korDen parents: diff changeset	2
114 e28b18c23469 added a module dmd.common for commonly used stuff Trass3r parents: 113 diff changeset	3 import dmd.common;
4 d706d958e4e8 Step 2 of restoring GC functionality. korDen parents: 2 diff changeset	4 import core.memory;
2 7427ded8caf7 Removed unreferenced modules korDen parents: 0 diff changeset	5
34 544b922227c7 update to work with dmd 2.048 korDen parents: 4 diff changeset	6 import std.exception;
2 7427ded8caf7 Removed unreferenced modules korDen parents: 0 diff changeset	7 import core.stdc.string;
0 10317f0c89a5 Initial commit korDen parents: diff changeset	8 import core.stdc.stdlib;
10317f0c89a5 Initial commit korDen parents: diff changeset	9
10317f0c89a5 Initial commit korDen parents: diff changeset	10 class Array
10317f0c89a5 Initial commit korDen parents: diff changeset	11 {
10317f0c89a5 Initial commit korDen parents: diff changeset	12 uint dim = 0;
10317f0c89a5 Initial commit korDen parents: diff changeset	13 uint allocdim = 0;
10317f0c89a5 Initial commit korDen parents: diff changeset	14 void** data = null;
10317f0c89a5 Initial commit korDen parents: diff changeset	15
10317f0c89a5 Initial commit korDen parents: diff changeset	16 ~this()
10317f0c89a5 Initial commit korDen parents: diff changeset	17 {
10317f0c89a5 Initial commit korDen parents: diff changeset	18 ///mem.free(data);
10317f0c89a5 Initial commit korDen parents: diff changeset	19 }
10317f0c89a5 Initial commit korDen parents: diff changeset	20
10317f0c89a5 Initial commit korDen parents: diff changeset	21 void mark()
10317f0c89a5 Initial commit korDen parents: diff changeset	22 {
10317f0c89a5 Initial commit korDen parents: diff changeset	23 ///unsigned u;
10317f0c89a5 Initial commit korDen parents: diff changeset	24 ///mem.mark(data);
10317f0c89a5 Initial commit korDen parents: diff changeset	25 ///for (u = 0; u < dim; u++)
10317f0c89a5 Initial commit korDen parents: diff changeset	26 ///mem.mark(data[u]); // BUG: what if arrays of Object's?
10317f0c89a5 Initial commit korDen parents: diff changeset	27 }
10317f0c89a5 Initial commit korDen parents: diff changeset	28
72 2e2a5c3f943a reduced warnings by adding override to the methods Trass3r parents: 34 diff changeset	29 override string toString()
0 10317f0c89a5 Initial commit korDen parents: diff changeset	30 {
10317f0c89a5 Initial commit korDen parents: diff changeset	31 char *p;
10317f0c89a5 Initial commit korDen parents: diff changeset	32
10317f0c89a5 Initial commit korDen parents: diff changeset	33 ///char buf = cast(char)alloca(dim * (char*).sizeof);
10317f0c89a5 Initial commit korDen parents: diff changeset	34 scope string[] buf = new string[dim];
10317f0c89a5 Initial commit korDen parents: diff changeset	35 uint len = 2;
10317f0c89a5 Initial commit korDen parents: diff changeset	36 for (uint u = 0; u < dim; u++) {
10317f0c89a5 Initial commit korDen parents: diff changeset	37 buf[u] = (cast(Object)data[u]).toString();
10317f0c89a5 Initial commit korDen parents: diff changeset	38 len += buf[u].length + 1;
10317f0c89a5 Initial commit korDen parents: diff changeset	39 }
10317f0c89a5 Initial commit korDen parents: diff changeset	40
2 7427ded8caf7 Removed unreferenced modules korDen parents: 0 diff changeset	41 char* str = cast(char*)GC.malloc(len);
0 10317f0c89a5 Initial commit korDen parents: diff changeset	42
10317f0c89a5 Initial commit korDen parents: diff changeset	43 str[0] = '[';
10317f0c89a5 Initial commit korDen parents: diff changeset	44 p = str + 1;
10317f0c89a5 Initial commit korDen parents: diff changeset	45
10317f0c89a5 Initial commit korDen parents: diff changeset	46 for (uint u = 0; u < dim; u++)
10317f0c89a5 Initial commit korDen parents: diff changeset	47 {
10317f0c89a5 Initial commit korDen parents: diff changeset	48 if (u != 0) {
10317f0c89a5 Initial commit korDen parents: diff changeset	49 *p++ = ',';
10317f0c89a5 Initial commit korDen parents: diff changeset	50 }
10317f0c89a5 Initial commit korDen parents: diff changeset	51 uint length = buf[u].length;
10317f0c89a5 Initial commit korDen parents: diff changeset	52 p[0..length] = buf[u][];
10317f0c89a5 Initial commit korDen parents: diff changeset	53
10317f0c89a5 Initial commit korDen parents: diff changeset	54 p += length;
10317f0c89a5 Initial commit korDen parents: diff changeset	55 }
10317f0c89a5 Initial commit korDen parents: diff changeset	56
10317f0c89a5 Initial commit korDen parents: diff changeset	57 *p++ = ']';
10317f0c89a5 Initial commit korDen parents: diff changeset	58 *p = 0;
10317f0c89a5 Initial commit korDen parents: diff changeset	59
10317f0c89a5 Initial commit korDen parents: diff changeset	60 return assumeUnique(str[0..len]);
10317f0c89a5 Initial commit korDen parents: diff changeset	61 }
10317f0c89a5 Initial commit korDen parents: diff changeset	62
10317f0c89a5 Initial commit korDen parents: diff changeset	63 final void reserve(uint nentries)
10317f0c89a5 Initial commit korDen parents: diff changeset	64 {
10317f0c89a5 Initial commit korDen parents: diff changeset	65 //printf("Array::reserve: size = %d, offset = %d, nbytes = %d\n", size, offset, nbytes);
10317f0c89a5 Initial commit korDen parents: diff changeset	66 if (allocdim - dim < nentries) {
10317f0c89a5 Initial commit korDen parents: diff changeset	67 allocdim = dim + nentries;
2 7427ded8caf7 Removed unreferenced modules korDen parents: 0 diff changeset	68 data = cast(void*)GC.realloc(data, allocdim (*data).sizeof);
0 10317f0c89a5 Initial commit korDen parents: diff changeset	69 }
10317f0c89a5 Initial commit korDen parents: diff changeset	70 }
10317f0c89a5 Initial commit korDen parents: diff changeset	71
10317f0c89a5 Initial commit korDen parents: diff changeset	72 final void setDim(uint newdim)
10317f0c89a5 Initial commit korDen parents: diff changeset	73 {
10317f0c89a5 Initial commit korDen parents: diff changeset	74 if (dim < newdim) {
10317f0c89a5 Initial commit korDen parents: diff changeset	75 reserve(newdim - dim);
10317f0c89a5 Initial commit korDen parents: diff changeset	76 }
10317f0c89a5 Initial commit korDen parents: diff changeset	77
10317f0c89a5 Initial commit korDen parents: diff changeset	78 dim = newdim;
10317f0c89a5 Initial commit korDen parents: diff changeset	79 }
10317f0c89a5 Initial commit korDen parents: diff changeset	80
10317f0c89a5 Initial commit korDen parents: diff changeset	81 final void fixDim()
10317f0c89a5 Initial commit korDen parents: diff changeset	82 {
10317f0c89a5 Initial commit korDen parents: diff changeset	83 if (dim != allocdim)
10317f0c89a5 Initial commit korDen parents: diff changeset	84 {
2 7427ded8caf7 Removed unreferenced modules korDen parents: 0 diff changeset	85 data = cast(void*)GC.realloc(data, dim (*data).sizeof);
0 10317f0c89a5 Initial commit korDen parents: diff changeset	86 allocdim = dim;
10317f0c89a5 Initial commit korDen parents: diff changeset	87 }
10317f0c89a5 Initial commit korDen parents: diff changeset	88 }
10317f0c89a5 Initial commit korDen parents: diff changeset	89
10317f0c89a5 Initial commit korDen parents: diff changeset	90 final void push(void* ptr)
10317f0c89a5 Initial commit korDen parents: diff changeset	91 {
10317f0c89a5 Initial commit korDen parents: diff changeset	92 reserve(1);
10317f0c89a5 Initial commit korDen parents: diff changeset	93 data[dim++] = ptr;
10317f0c89a5 Initial commit korDen parents: diff changeset	94 }
10317f0c89a5 Initial commit korDen parents: diff changeset	95
10317f0c89a5 Initial commit korDen parents: diff changeset	96 final void* pop()
10317f0c89a5 Initial commit korDen parents: diff changeset	97 {
10317f0c89a5 Initial commit korDen parents: diff changeset	98 return data[--dim];
10317f0c89a5 Initial commit korDen parents: diff changeset	99 }
10317f0c89a5 Initial commit korDen parents: diff changeset	100
10317f0c89a5 Initial commit korDen parents: diff changeset	101 final void shift(void* ptr)
10317f0c89a5 Initial commit korDen parents: diff changeset	102 {
10317f0c89a5 Initial commit korDen parents: diff changeset	103 reserve(1);
10317f0c89a5 Initial commit korDen parents: diff changeset	104 memmove(data + 1, data, dim * (*data).sizeof);
10317f0c89a5 Initial commit korDen parents: diff changeset	105 data[0] = ptr;
10317f0c89a5 Initial commit korDen parents: diff changeset	106 dim++;
10317f0c89a5 Initial commit korDen parents: diff changeset	107 }
10317f0c89a5 Initial commit korDen parents: diff changeset	108
10317f0c89a5 Initial commit korDen parents: diff changeset	109 final void insert(uint index, void* ptr)
10317f0c89a5 Initial commit korDen parents: diff changeset	110 {
10317f0c89a5 Initial commit korDen parents: diff changeset	111 reserve(1);
10317f0c89a5 Initial commit korDen parents: diff changeset	112 memmove(data + index + 1, data + index, (dim - index) * (*data).sizeof);
10317f0c89a5 Initial commit korDen parents: diff changeset	113 data[index] = ptr;
10317f0c89a5 Initial commit korDen parents: diff changeset	114 dim++;
10317f0c89a5 Initial commit korDen parents: diff changeset	115 }
10317f0c89a5 Initial commit korDen parents: diff changeset	116
10317f0c89a5 Initial commit korDen parents: diff changeset	117 final void insert(uint index, Array a)
10317f0c89a5 Initial commit korDen parents: diff changeset	118 {
10317f0c89a5 Initial commit korDen parents: diff changeset	119 if (a !is null) {
10317f0c89a5 Initial commit korDen parents: diff changeset	120 uint d = a.dim;
10317f0c89a5 Initial commit korDen parents: diff changeset	121 reserve(d);
10317f0c89a5 Initial commit korDen parents: diff changeset	122
10317f0c89a5 Initial commit korDen parents: diff changeset	123 if (dim != index) {
10317f0c89a5 Initial commit korDen parents: diff changeset	124 memmove(data + index + d, data + index, (dim - index) * (*data).sizeof);
10317f0c89a5 Initial commit korDen parents: diff changeset	125 }
10317f0c89a5 Initial commit korDen parents: diff changeset	126
10317f0c89a5 Initial commit korDen parents: diff changeset	127 memcpy(data + index, a.data, d * (*data).sizeof);
10317f0c89a5 Initial commit korDen parents: diff changeset	128 dim += d;
10317f0c89a5 Initial commit korDen parents: diff changeset	129 }
10317f0c89a5 Initial commit korDen parents: diff changeset	130 }
10317f0c89a5 Initial commit korDen parents: diff changeset	131
10317f0c89a5 Initial commit korDen parents: diff changeset	132 /***********************************
10317f0c89a5 Initial commit korDen parents: diff changeset	133 * Append array a to this array.
10317f0c89a5 Initial commit korDen parents: diff changeset	134 */
10317f0c89a5 Initial commit korDen parents: diff changeset	135 final void append(Array a)
10317f0c89a5 Initial commit korDen parents: diff changeset	136 {
10317f0c89a5 Initial commit korDen parents: diff changeset	137 insert(dim, a);
10317f0c89a5 Initial commit korDen parents: diff changeset	138 }
10317f0c89a5 Initial commit korDen parents: diff changeset	139
10317f0c89a5 Initial commit korDen parents: diff changeset	140 final void remove(uint i)
10317f0c89a5 Initial commit korDen parents: diff changeset	141 {
10317f0c89a5 Initial commit korDen parents: diff changeset	142 memmove(data + i, data + i + 1, (dim - i) * (*data).sizeof);
10317f0c89a5 Initial commit korDen parents: diff changeset	143 dim--;
10317f0c89a5 Initial commit korDen parents: diff changeset	144 }
10317f0c89a5 Initial commit korDen parents: diff changeset	145
10317f0c89a5 Initial commit korDen parents: diff changeset	146 final void zero()
10317f0c89a5 Initial commit korDen parents: diff changeset	147 {
10317f0c89a5 Initial commit korDen parents: diff changeset	148 memset(data, 0, dim * (*data).sizeof);
10317f0c89a5 Initial commit korDen parents: diff changeset	149 }
10317f0c89a5 Initial commit korDen parents: diff changeset	150
10317f0c89a5 Initial commit korDen parents: diff changeset	151 final void* tos()
10317f0c89a5 Initial commit korDen parents: diff changeset	152 {
10317f0c89a5 Initial commit korDen parents: diff changeset	153 return dim ? data[dim - 1] : null;
10317f0c89a5 Initial commit korDen parents: diff changeset	154 }
10317f0c89a5 Initial commit korDen parents: diff changeset	155
10317f0c89a5 Initial commit korDen parents: diff changeset	156 private static extern (C) int Array_sort_compare(const(void) x, const(void) y)
10317f0c89a5 Initial commit korDen parents: diff changeset	157 {
10317f0c89a5 Initial commit korDen parents: diff changeset	158 Object ox = cast(Object )x;
10317f0c89a5 Initial commit korDen parents: diff changeset	159 Object oy = cast(Object )y;
10317f0c89a5 Initial commit korDen parents: diff changeset	160
10317f0c89a5 Initial commit korDen parents: diff changeset	161 return ox.opCmp(oy);
10317f0c89a5 Initial commit korDen parents: diff changeset	162 }
10317f0c89a5 Initial commit korDen parents: diff changeset	163
10317f0c89a5 Initial commit korDen parents: diff changeset	164 final void sort()
10317f0c89a5 Initial commit korDen parents: diff changeset	165 {
10317f0c89a5 Initial commit korDen parents: diff changeset	166 if (dim) {
10317f0c89a5 Initial commit korDen parents: diff changeset	167 qsort(cast(void*)data, dim, Object.sizeof, &Array_sort_compare);
10317f0c89a5 Initial commit korDen parents: diff changeset	168 }
10317f0c89a5 Initial commit korDen parents: diff changeset	169 }
10317f0c89a5 Initial commit korDen parents: diff changeset	170
10317f0c89a5 Initial commit korDen parents: diff changeset	171 final Array copyTo(Array a)
10317f0c89a5 Initial commit korDen parents: diff changeset	172 {
10317f0c89a5 Initial commit korDen parents: diff changeset	173 a.setDim(dim);
10317f0c89a5 Initial commit korDen parents: diff changeset	174 memcpy(a.data, data, dim * (*data).sizeof);
10317f0c89a5 Initial commit korDen parents: diff changeset	175
10317f0c89a5 Initial commit korDen parents: diff changeset	176 return a;
10317f0c89a5 Initial commit korDen parents: diff changeset	177 }
10317f0c89a5 Initial commit korDen parents: diff changeset	178
10317f0c89a5 Initial commit korDen parents: diff changeset	179 final Array copy()
10317f0c89a5 Initial commit korDen parents: diff changeset	180 {
10317f0c89a5 Initial commit korDen parents: diff changeset	181 return copyTo(new Array());
10317f0c89a5 Initial commit korDen parents: diff changeset	182 }
72 2e2a5c3f943a reduced warnings by adding override to the methods Trass3r parents: 34 diff changeset	183 }
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	184
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	185 class Vector(T)
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	186 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	187 public:
77 ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	188 @property final size_t dim()
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	189 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	190 return _dim;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	191 }
77 ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	192
84 be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	193 @property final void dim(size_t newDim)
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	194 {
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	195 _dim = newDim;
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	196 }
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	197
77 ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	198 @property final size_t length() const
ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	199 {
ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	200 return _dim;
ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	201 }
ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	202 /* Doesn't work due to compiler BUG
ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	203 @property final size_t opDollar() const
ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	204 {
ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	205 return _dim;
ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	206 }
ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	207 */
84 be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	208
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	209 @property T *data()
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	210 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	211 return _data;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	212 }
84 be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	213
90 39648eb578f6 more Expressions work Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 84 diff changeset	214 @property T *ptr()
39648eb578f6 more Expressions work Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 84 diff changeset	215 {
39648eb578f6 more Expressions work Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 84 diff changeset	216 return _data;
39648eb578f6 more Expressions work Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 84 diff changeset	217 }
39648eb578f6 more Expressions work Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 84 diff changeset	218
77 ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	219 @property final size_t allocdim()
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	220 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	221 return _allocdim;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	222 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	223
84 be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	224 ref T opIndex(size_t index)
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	225 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	226 return _data[index];
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	227 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	228
77 ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	229 void opIndexAssign(T value, size_t index)
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	230 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	231 _data[index] = value;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	232 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	233
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	234 final T pop()
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	235 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	236 T v = _data[--_dim];
84 be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	237 // _data[dim] = T.init;
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	238 return v;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	239 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	240
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	241 final void push(T elem)
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	242 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	243 reserve(1);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	244 _data[_dim++] = elem;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	245 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	246
94 3a0b150c9841 Objects -> Vector!Object iteration 1 Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 90 diff changeset	247 final void zero()
3a0b150c9841 Objects -> Vector!Object iteration 1 Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 90 diff changeset	248 {
3a0b150c9841 Objects -> Vector!Object iteration 1 Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 90 diff changeset	249 memset(_data, 0, dim * T.sizeof);
3a0b150c9841 Objects -> Vector!Object iteration 1 Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 90 diff changeset	250 // TODO fix to assign T.init
3a0b150c9841 Objects -> Vector!Object iteration 1 Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 90 diff changeset	251 }
3a0b150c9841 Objects -> Vector!Object iteration 1 Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 90 diff changeset	252
77 ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	253 final void reserve(size_t nentries)
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	254 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	255 //printf("Array::reserve: size = %d, offset = %d, nbytes = %d\n", size, offset, nbytes);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	256 if (allocdim - dim < nentries) {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	257 _allocdim = dim + nentries;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	258 _data = cast(T)GC.realloc(_data, allocdim T.sizeof);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	259 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	260 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	261
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	262 final void shift(T ptr)
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	263 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	264 reserve(1);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	265 memmove(_data + 1, _data, _dim * T.sizeof);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	266 _data[0] = ptr;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	267 _dim++;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	268 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	269
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	270 final Vector!T copy()
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	271 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	272 return copyTo(new Vector!T());
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	273 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	274
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	275 final Vector!T copyTo(Vector!T a)
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	276 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	277 a.setDim(dim);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	278 memcpy(a._data, _data, dim * T.sizeof);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	279 // TODO call postblits
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	280 return a;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	281 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	282
77 ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	283 final void setDim(size_t newdim)
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	284 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	285 if (dim < newdim) {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	286 reserve(newdim - dim);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	287 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	288
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	289 _dim = newdim;
84 be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	290 // TODO if newdim < dim set memory to T.init
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	291 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	292
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	293 int opApply(scope int delegate(ref T) dg)
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	294 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	295 int result = 0;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	296
77 ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	297 for (size_t i = 0; i < _dim; i++)
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	298 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	299 result = dg(_data[i]);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	300 if (result)
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	301 break;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	302 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	303 return result;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	304 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	305
77 ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	306 int opApply(scope int delegate(ref size_t key, ref T value) dg)
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	307 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	308 int result = 0;
77 ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	309 for (size_t i = 0; i < _dim; i++)
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	310 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	311 result = dg(i, _data[i]);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	312 if(result)
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	313 break;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	314 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	315 return result;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	316 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	317
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	318 final void append(Vector!T a)
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	319 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	320 insert(dim, a);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	321 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	322
84 be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	323 final void remove(size_t i)
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	324 {
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	325 memmove(_data + i, _data + i + 1, (_dim - i) * T.sizeof);
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	326 // _data[dim-1] = T.init;
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	327 _dim--;
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	328 }
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	329
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	330 final void insert(uint index, T ptr)
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	331 {
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	332 reserve(1);
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	333 memmove(_data + index + 1, _data + index, (_dim - index) * T.sizeof);
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	334 _data[index] = ptr;
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	335 _dim++;
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	336 }
be2ab491772e Expressions -> Vector!Expression Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 77 diff changeset	337
77 ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	338 final void insert(size_t index, Vector!T a)
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	339 {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	340 if (a !is null) {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	341 uint d = a.dim;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	342 reserve(d);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	343
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	344 if (dim != index) {
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	345 memmove(_data + index + d, _data + index, (dim - index) * T.sizeof);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	346 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	347
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	348 memcpy(_data + index, a._data, d * T.sizeof);
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	349 _dim += d;
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	350 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	351 }
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	352 private:
7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	353 T* _data = null;
77 ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	354 size_t _dim = 0;
ad4792a1cfd6 more D-ification container accessing Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 74 diff changeset	355 size_t _allocdim = 0;
74 7e0d548de9e6 Switch Arrays of Dsymbols to the new templated Vector type Eldar Insafutdinov <e.insafutdinov@gmail.com> parents: 72 diff changeset	356 }

Mercurial > projects > ddmd

annotate dmd/Array.d @ 114:e28b18c23469