aboutsummaryrefslogtreecommitdiff
path: root/gcc/d/dmd/dmodule.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/d/dmd/dmodule.c')
-rw-r--r--gcc/d/dmd/dmodule.c62
1 files changed, 31 insertions, 31 deletions
diff --git a/gcc/d/dmd/dmodule.c b/gcc/d/dmd/dmodule.c
index f251814..ba7885e 100644
--- a/gcc/d/dmd/dmodule.c
+++ b/gcc/d/dmd/dmodule.c
@@ -224,14 +224,14 @@ Module *Module::load(Loc loc, Identifiers *packages, Identifier *ident)
// into:
// foo\bar\baz
const char *filename = ident->toChars();
- if (packages && packages->dim)
+ if (packages && packages->length)
{
OutBuffer buf;
OutBuffer dotmods;
Array<const char *> *ms = global.params.modFileAliasStrings;
- const size_t msdim = ms ? ms->dim : 0;
+ const size_t msdim = ms ? ms->length : 0;
- for (size_t i = 0; i < packages->dim; i++)
+ for (size_t i = 0; i < packages->length; i++)
{
Identifier *pid = (*packages)[i];
const char *p = pid->toChars();
@@ -275,7 +275,7 @@ Module *Module::load(Loc loc, Identifiers *packages, Identifier *ident)
OutBuffer buf;
if (packages)
{
- for (size_t i = 0; i < packages->dim; i++)
+ for (size_t i = 0; i < packages->length; i++)
{
Identifier *pid = (*packages)[i];
buf.writestring(pid->toChars());
@@ -324,7 +324,7 @@ bool Module::read(Loc loc)
*/
if (global.path)
{
- for (size_t i = 0; i < global.path->dim; i++)
+ for (size_t i = 0; i < global.path->length; i++)
{
const char *p = (*global.path)[i];
fprintf(stderr, "import path[%llu] = %s\n", (ulonglong)i, p);
@@ -679,7 +679,7 @@ void Module::importAll(Scope *)
// If it isn't there, some compiler rewrites, like
// classinst == classinst -> .object.opEquals(classinst, classinst)
// would fail inside object.d.
- if (members->dim == 0 || ((*members)[0])->ident != Id::object ||
+ if (members->length == 0 || ((*members)[0])->ident != Id::object ||
(*members)[0]->isImport() == NULL)
{
Import *im = new Import(Loc(), NULL, Id::object, NULL, 0);
@@ -690,7 +690,7 @@ void Module::importAll(Scope *)
{
// Add all symbols into module's symbol table
symtab = new DsymbolTable();
- for (size_t i = 0; i < members->dim; i++)
+ for (size_t i = 0; i < members->length; i++)
{
Dsymbol *s = (*members)[i];
s->addMember(sc, sc->scopesym);
@@ -704,13 +704,13 @@ void Module::importAll(Scope *)
* before any semantic() on any of them.
*/
setScope(sc); // remember module scope for semantic
- for (size_t i = 0; i < members->dim; i++)
+ for (size_t i = 0; i < members->length; i++)
{
Dsymbol *s = (*members)[i];
s->setScope(sc);
}
- for (size_t i = 0; i < members->dim; i++)
+ for (size_t i = 0; i < members->length; i++)
{
Dsymbol *s = (*members)[i];
s->importAll(sc);
@@ -740,7 +740,7 @@ void Module::semantic(Scope *)
//printf("Module = %p, linkage = %d\n", sc->scopesym, sc->linkage);
// Pass 1 semantic routines: do public side of the definition
- for (size_t i = 0; i < members->dim; i++)
+ for (size_t i = 0; i < members->length; i++)
{
Dsymbol *s = (*members)[i];
@@ -777,7 +777,7 @@ void Module::semantic2(Scope*)
//printf("Module = %p\n", sc.scopesym);
// Pass 2 semantic routines: do initializers and function bodies
- for (size_t i = 0; i < members->dim; i++)
+ for (size_t i = 0; i < members->length; i++)
{
Dsymbol *s = (*members)[i];
s->semantic2(sc);
@@ -808,7 +808,7 @@ void Module::semantic3(Scope*)
//printf("Module = %p\n", sc.scopesym);
// Pass 3 semantic routines: do initializers and function bodies
- for (size_t i = 0; i < members->dim; i++)
+ for (size_t i = 0; i < members->length; i++)
{
Dsymbol *s = (*members)[i];
//printf("Module %s: %s.semantic3()\n", toChars(), s->toChars());
@@ -899,7 +899,7 @@ Dsymbol *Module::symtabInsert(Dsymbol *s)
void Module::clearCache()
{
- for (size_t i = 0; i < amodules.dim; i++)
+ for (size_t i = 0; i < amodules.length; i++)
{
Module *m = amodules[i];
m->searchCacheIdent = NULL;
@@ -913,7 +913,7 @@ void Module::clearCache()
void Module::addDeferredSemantic(Dsymbol *s)
{
// Don't add it if it is already there
- for (size_t i = 0; i < deferred.dim; i++)
+ for (size_t i = 0; i < deferred.length; i++)
{
Dsymbol *sd = deferred[i];
@@ -949,14 +949,14 @@ void Module::runDeferredSemantic()
static int nested;
if (nested)
return;
- //if (deferred.dim) printf("+Module::runDeferredSemantic(), len = %d\n", deferred.dim);
+ //if (deferred.length) printf("+Module::runDeferredSemantic(), len = %d\n", deferred.length);
nested++;
size_t len;
do
{
dprogress = 0;
- len = deferred.dim;
+ len = deferred.length;
if (!len)
break;
@@ -982,12 +982,12 @@ void Module::runDeferredSemantic()
s->semantic(NULL);
//printf("deferred: %s, parent = %s\n", s->toChars(), s->parent->toChars());
}
- //printf("\tdeferred.dim = %d, len = %d, dprogress = %d\n", deferred.dim, len, dprogress);
+ //printf("\tdeferred.length = %d, len = %d, dprogress = %d\n", deferred.length, len, dprogress);
if (todoalloc)
free(todoalloc);
- } while (deferred.dim < len || dprogress); // while making progress
+ } while (deferred.length < len || dprogress); // while making progress
nested--;
- //printf("-Module::runDeferredSemantic(), len = %d\n", deferred.dim);
+ //printf("-Module::runDeferredSemantic(), len = %d\n", deferred.length);
}
void Module::runDeferredSemantic2()
@@ -995,7 +995,7 @@ void Module::runDeferredSemantic2()
Module::runDeferredSemantic();
Dsymbols *a = &Module::deferred2;
- for (size_t i = 0; i < a->dim; i++)
+ for (size_t i = 0; i < a->length; i++)
{
Dsymbol *s = (*a)[i];
//printf("[%d] %s semantic2a\n", i, s->toPrettyChars());
@@ -1012,7 +1012,7 @@ void Module::runDeferredSemantic3()
Module::runDeferredSemantic2();
Dsymbols *a = &Module::deferred3;
- for (size_t i = 0; i < a->dim; i++)
+ for (size_t i = 0; i < a->length; i++)
{
Dsymbol *s = (*a)[i];
//printf("[%d] %s semantic3a\n", i, s->toPrettyChars());
@@ -1034,7 +1034,7 @@ void Module::runDeferredSemantic3()
int Module::imports(Module *m)
{
//printf("%s Module::imports(%s)\n", toChars(), m->toChars());
- for (size_t i = 0; i < aimports.dim; i++)
+ for (size_t i = 0; i < aimports.length; i++)
{
Module *mi = aimports[i];
if (mi == m)
@@ -1059,12 +1059,12 @@ bool Module::selfImports()
//printf("Module::selfImports() %s\n", toChars());
if (selfimports == 0)
{
- for (size_t i = 0; i < amodules.dim; i++)
+ for (size_t i = 0; i < amodules.length; i++)
amodules[i]->insearch = 0;
selfimports = imports(this) + 1;
- for (size_t i = 0; i < amodules.dim; i++)
+ for (size_t i = 0; i < amodules.length; i++)
amodules[i]->insearch = 0;
}
return selfimports == 2;
@@ -1079,11 +1079,11 @@ bool Module::rootImports()
//printf("Module::rootImports() %s\n", toChars());
if (rootimports == 0)
{
- for (size_t i = 0; i < amodules.dim; i++)
+ for (size_t i = 0; i < amodules.length; i++)
amodules[i]->insearch = 0;
rootimports = 1;
- for (size_t i = 0; i < amodules.dim; ++i)
+ for (size_t i = 0; i < amodules.length; ++i)
{
Module *m = amodules[i];
if (m->isRoot() && imports(m))
@@ -1093,7 +1093,7 @@ bool Module::rootImports()
}
}
- for (size_t i = 0; i < amodules.dim; i++)
+ for (size_t i = 0; i < amodules.length; i++)
amodules[i]->insearch = 0;
}
return rootimports == 2;
@@ -1119,9 +1119,9 @@ const char *ModuleDeclaration::toChars()
{
OutBuffer buf;
- if (packages && packages->dim)
+ if (packages && packages->length)
{
- for (size_t i = 0; i < packages->dim; i++)
+ for (size_t i = 0; i < packages->length; i++)
{
Identifier *pid = (*packages)[i];
buf.writestring(pid->toChars());
@@ -1207,7 +1207,7 @@ DsymbolTable *Package::resolve(Identifiers *packages, Dsymbol **pparent, Package
if (packages)
{
- for (size_t i = 0; i < packages->dim; i++)
+ for (size_t i = 0; i < packages->length; i++)
{
Identifier *pid = (*packages)[i];
Package *pkg;
@@ -1318,7 +1318,7 @@ const char *lookForSourceFile(const char **path, const char *filename)
if (!global.path)
return NULL;
- for (size_t i = 0; i < global.path->dim; i++)
+ for (size_t i = 0; i < global.path->length; i++)
{
const char *p = (*global.path)[i];
generated by cgit v1.1 at 2025-05-28 04:32:09 +0000