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

Merge branch 'llvm3.0' into merge-3.0

Browse Source 
Conflicts:
	gen/configfile.cpp
This commit is contained in:
David Nadlinger
2011-12-04 18:16:36 +01:00
parent 5458ebb0b2 eda643da11
commit fe19ee84f5
15 changed files with 73 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gen/main.cpp
View File

@@ -322,7 +322,7 @@ int main(int argc, char** argv)
{
if (libs)
{
for (int i = 0; i < libs->dim; i++)
for (unsigned i = 0; i < libs->dim; i++)
{
char* lib = (char *)libs->data[i];
char *arg = (char *)mem.malloc(strlen(lib) + 3);
@@ -664,7 +664,7 @@ int main(int argc, char** argv)
// Build import search path
if (global.params.imppath)
{
for (int i = 0; i < global.params.imppath->dim; i++)
for (unsigned i = 0; i < global.params.imppath->dim; i++)
{
char *path = (char *)global.params.imppath->data[i];
Strings *a = FileName::splitPath(path);
@@ -681,7 +681,7 @@ int main(int argc, char** argv)
// Build string import search path
if (global.params.fileImppath)
{
for (int i = 0; i < global.params.fileImppath->dim; i++)
for (unsigned i = 0; i < global.params.fileImppath->dim; i++)
{
char *path = (char *)global.params.fileImppath->data[i];
Strings *a = FileName::splitPath(path);
@@ -698,7 +698,7 @@ int main(int argc, char** argv)
// Create Modules
Modules modules;
modules.reserve(files.dim);
for (int i = 0; i < files.dim; i++)
for (unsigned i = 0; i < files.dim; i++)
{ Identifier *id;
char *ext;
char *name;
@@ -805,7 +805,7 @@ int main(int argc, char** argv)
}
// Read files, parse them
for (int i = 0; i < modules.dim; i++)
for (unsigned i = 0; i < modules.dim; i++)
{
m = (Module *)modules.data[i];
if (global.params.verbose)
@@ -840,7 +840,7 @@ int main(int argc, char** argv)
* line switches and what else is imported, they are generated
* before any semantic analysis.
*/
for (int i = 0; i < modules.dim; i++)
for (unsigned i = 0; i < modules.dim; i++)
{
m = (Module *)modules.data[i];
if (global.params.verbose)
@@ -853,7 +853,7 @@ int main(int argc, char** argv)
#endif
// load all unconditional imports for better symbol resolving
for (int i = 0; i < modules.dim; i++)
for (unsigned i = 0; i < modules.dim; i++)
{
m = (Module *)modules.data[i];
if (global.params.verbose)
@@ -864,7 +864,7 @@ int main(int argc, char** argv)
fatal();
// Do semantic analysis
for (int i = 0; i < modules.dim; i++)
for (unsigned i = 0; i < modules.dim; i++)
{
m = (Module *)modules.data[i];
if (global.params.verbose)
@@ -878,7 +878,7 @@ int main(int argc, char** argv)
Module::runDeferredSemantic();
// Do pass 2 semantic analysis
for (int i = 0; i < modules.dim; i++)
for (unsigned i = 0; i < modules.dim; i++)
{
m = (Module *)modules.data[i];
if (global.params.verbose)
@@ -889,7 +889,7 @@ int main(int argc, char** argv)
fatal();
// Do pass 3 semantic analysis
for (int i = 0; i < modules.dim; i++)
for (unsigned i = 0; i < modules.dim; i++)
{
m = (Module *)modules.data[i];
if (global.params.verbose)
@@ -919,7 +919,7 @@ int main(int argc, char** argv)
{
// Do pass 3 semantic analysis on all imported modules,
// since otherwise functions in them cannot be inlined
for (int i = 0; i < Module::amodules.dim; i++)
for (unsigned i = 0; i < Module::amodules.dim; i++)
{
m = (Module *)Module::amodules.data[i];
if (global.params.verbose)
@@ -959,7 +959,7 @@ int main(int argc, char** argv)
llvm::LLVMContext& context = llvm::getGlobalContext();
// Generate output files
for (int i = 0; i < modules.dim; i++)
for (unsigned i = 0; i < modules.dim; i++)
{
m = (Module *)modules.data[i];
if (global.params.verbose)
@@ -1034,7 +1034,7 @@ int main(int argc, char** argv)
/* Delete .obj files and .exe file
*/
for (int i = 0; i < modules.dim; i++)
for (unsigned i = 0; i < modules.dim; i++)
{
m = (Module *)modules.data[i];
m->deleteObjFile();