D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-04-17 17:29:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Automated merge with http://hg.dsource.org/projects/ldc

Browse Source
This commit is contained in:
Christian Kamm
2008-12-12 08:18:30 +01:00
parent eeb4e67ec5 c14996f39e
commit 62bb24d1bd
10 changed files with 101 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/internal/genobj.d
View File

@@ -1060,7 +1060,7 @@ extern (C) void _moduleCtor()
_moduleinfo_dtors = new ModuleInfo[_moduleinfo_array.length];
debug(PRINTF) printf("_moduleinfo_dtors = x%x\n", cast(void *)_moduleinfo_dtors);
_moduleIndependentCtors();
_moduleCtor2(_moduleinfo_array, 0);
_moduleCtor2(null, _moduleinfo_array, 0);
}
extern (C) void _moduleIndependentCtors()
@@ -1076,7 +1076,7 @@ extern (C) void _moduleIndependentCtors()
debug(PRINTF) printf("_moduleIndependentCtors() DONE\n");
}
void _moduleCtor2(ModuleInfo[] mi, int skip)
void _moduleCtor2(ModuleInfo from, ModuleInfo[] mi, int skip)
{
debug(PRINTF) printf("_moduleCtor2(): %d modules\n", mi.length);
for (uint i = 0; i < mi.length; i++)
@@ -1096,11 +1096,12 @@ void _moduleCtor2(ModuleInfo[] mi, int skip)
if (m.flags & MIctorstart)
{ if (skip || m.flags & MIstandalone)
continue;
throw new Exception( "Cyclic dependency in module " ~ m.name );
assert(from !is null);
throw new Exception( "Cyclic dependency in module " ~ from.name ~ " for import " ~ m.name);
}
m.flags |= MIctorstart;
_moduleCtor2(m.importedModules, 0);
_moduleCtor2(m, m.importedModules, 0);
if (m.ctor)
(*m.ctor)();
m.flags &= ~MIctorstart;
@@ -1114,7 +1115,7 @@ void _moduleCtor2(ModuleInfo[] mi, int skip)
else
{
m.flags |= MIctordone;
_moduleCtor2(m.importedModules, 1);
_moduleCtor2(m, m.importedModules, 1);
}
}
debug(PRINTF) printf("_moduleCtor2() DONE\n");