comparison dmd/ClassDeclaration.d @ 169:e7769d53e750

Moves static variables from Module to Global
author korDen
date Thu, 30 Sep 2010 13:29:54 +0400
parents d8565fbd755c
children af724d3510d7
comparison
equal deleted inserted replaced
168:ceed63f310fb 169:e7769d53e750
280 global.classinfo = this; 280 global.classinfo = this;
281 } 281 }
282 282
283 if (id is Id.ModuleInfo) 283 if (id is Id.ModuleInfo)
284 { 284 {
285 if (Module.moduleinfo) 285 if (global.moduleinfo)
286 Module.moduleinfo.error("%s", msg); 286 global.moduleinfo.error("%s", msg);
287 Module.moduleinfo = this; 287 global.moduleinfo = this;
288 } 288 }
289 } 289 }
290 290
291 com = 0; 291 com = 0;
292 isauto = false; 292 isauto = false;
811 if (alignsize < thissize) 811 if (alignsize < thissize)
812 alignsize = thissize; 812 alignsize = thissize;
813 } 813 }
814 structsize = sc.offset; 814 structsize = sc.offset;
815 sizeok = 1; 815 sizeok = 1;
816 Module.dprogress++; 816 global.dprogress++;
817 817
818 dtor = buildDtor(sc); 818 dtor = buildDtor(sc);
819 819
820 sc.pop(); 820 sc.pop();
821 821
1113 ident is Id.TypeInfo_Class || 1113 ident is Id.TypeInfo_Class ||
1114 ident is Id.TypeInfo_Typedef || 1114 ident is Id.TypeInfo_Typedef ||
1115 ident is Id.TypeInfo_Tuple || 1115 ident is Id.TypeInfo_Tuple ||
1116 this is global.object || 1116 this is global.object ||
1117 this is global.classinfo || 1117 this is global.classinfo ||
1118 this is Module.moduleinfo || 1118 this is global.moduleinfo ||
1119 ident.toChars().startsWith("TypeInfo_") 1119 ident.toChars().startsWith("TypeInfo_")
1120 ) 1120 )
1121 { 1121 {
1122 parent = null; 1122 parent = null;
1123 } 1123 }