Changeset 62
- Timestamp:
- 05/02/05 19:03:42 (4 years ago)
- Files:
-
- trunk/dexter/linux.mak (modified) (2 diffs)
- trunk/dexter/stubs/annotation.c (modified) (4 diffs)
- trunk/dexter/stubs/toobj.c (modified) (6 diffs)
- trunk/dexter/win32.mak (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/dexter/linux.mak
r61 r62 51 51 stubs/todt.c \ 52 52 stubs/ir.c 53 stubs/annotation.c \ 54 stubs/xml.c 53 55 54 56 OBJ = \ … … 102 104 stubs/tocsym.o \ 103 105 stubs/todt.o \ 104 stubs/ir.o 106 stubs/ir.o \ 107 stubs\annotation.o \ 108 stubs\xml.o 105 109 106 110 DMC = g++ 107 111 CFLAGS = -g -Istubs -Idmd 108 EXE = d mdfe112 EXE = dexter 109 113 IDGEN = idgen 110 114 IMPCNV = impcnvgen trunk/dexter/stubs/annotation.c
r61 r62 109 109 //printf("take following (%0.8X <-- %0.8X) \n",this,other); 110 110 while(other->tags->dim > 0){ 111 AnnotationTag* tag = other->tags->data[0];111 AnnotationTag* tag = (AnnotationTag*)other->tags->data[0]; 112 112 if(tag->following){ 113 113 //printf("%s\n",tag->toChars()); … … 126 126 //printf("take non following (%0.8X <-- %0.8X) \n",this,other); 127 127 while(other->tags->dim > 0){ 128 AnnotationTag* tag = other->tags->data[0];128 AnnotationTag* tag = (AnnotationTag*)other->tags->data[0]; 129 129 if(!tag->following){ 130 130 //printf("%s\n",tag->toChars()); … … 187 187 void Annotation::toObjFile(){ 188 188 for(int i=0; i<tags->dim; i++){ 189 AnnotationTag* tag = tags->data[i];189 AnnotationTag* tag = (AnnotationTag*)tags->data[i]; 190 190 tag->toObjFile(); 191 191 } … … 195 195 OutBuffer *ob = new OutBuffer(); 196 196 for(int i=0; i<tags->dim; i++){ 197 AnnotationTag* tag = tags->data[i];197 AnnotationTag* tag = (AnnotationTag*)tags->data[i]; 198 198 ob->writestring(tag->toChars()); 199 199 ob->writestring("\n"); trunk/dexter/stubs/toobj.c
r61 r62 78 78 for(int i=0; i<arr->dim && (value=(vtype)arr->data[i]); i++) 79 79 80 #define FOREACH_V(vtype,value,arr) \ 81 if(arr.dim > 0) \ 82 for(int i=0; i<arr.dim && (value=(vtype)arr.data[i]); i++) 83 80 84 /* ================================================================== */ 81 85 … … 214 218 215 219 // base classes 216 for(int i=0; i<this->baseclasses.dim; i++){ 217 BaseClass* bc = (BaseClass*)this->baseclasses.data[i]; 218 220 BaseClass* bc; 221 FOREACH_V(BaseClass*,bc,this->baseclasses){ 219 222 XML::startTag("baseclass"); 220 223 addSymbolAttribute(bc->base); … … 226 229 227 230 // Put out the members 228 for (int i = 0; i < members->dim; i++) 229 { 230 Dsymbol *member; 231 member = (Dsymbol *)members->data[i]; 232 231 Dsymbol *member; 232 FOREACH(Dsymbol*, member,this->members){ 233 233 member->toObjFile(); 234 234 } … … 256 256 257 257 // Put out the members 258 for (int i = 0; i < members->dim; i++) 259 { 260 Dsymbol *member; 258 Dsymbol *member; 259 FOREACH(Dsymbol*, member,this->members){ 261 260 member = (Dsymbol *)members->data[i]; 262 261 … … 276 275 277 276 // Put out the members 278 for (int i = 0; i < members->dim; i++) 279 { 280 Dsymbol *member; 277 Dsymbol *member; 278 FOREACH(Dsymbol*, member,this->members){ 281 279 member = (Dsymbol *)members->data[i]; 282 280 … … 437 435 XML::startTag("parameters"); 438 436 if(parameters){ 439 for(int i=0; i<this->parameters->dim; i++){440 VarDeclaration* v = (VarDeclaration*)this->parameters->data[i];437 VarDeclaration* v; 438 FOREACH(VarDeclaration*, v,this->parameters){ 441 439 v->toObjFile(); 442 440 } trunk/dexter/win32.mak
r61 r62 110 110 DMC = dmc 111 111 CFLAGS = -g -Istubs -Idmd -w2 112 EXE = d mdfe.exe113 MAP = d mdfe.map112 EXE = dexter.exe 113 MAP = dexter.map 114 114 IDGEN = idgen.exe 115 115 IMPCNV = impcnvgen.exe