aboutsummaryrefslogtreecommitdiff
path: root/gcc/d/dmd/attrib.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/d/dmd/attrib.c')
-rw-r--r--gcc/d/dmd/attrib.c90
1 files changed, 45 insertions, 45 deletions
diff --git a/gcc/d/dmd/attrib.c b/gcc/d/dmd/attrib.c
index d84770f..6f176ef 100644
--- a/gcc/d/dmd/attrib.c
+++ b/gcc/d/dmd/attrib.c
@@ -55,7 +55,7 @@ int AttribDeclaration::apply(Dsymbol_apply_ft_t fp, void *param)
if (d)
{
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
if (s)
@@ -117,7 +117,7 @@ void AttribDeclaration::addMember(Scope *sc, ScopeDsymbol *sds)
{
Scope *sc2 = newScope(sc);
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
//printf("\taddMember %s to %s\n", s->toChars(), sds->toChars());
@@ -138,7 +138,7 @@ void AttribDeclaration::setScope(Scope *sc)
{
Scope *sc2 = newScope(sc);
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
s->setScope(sc2);
@@ -158,7 +158,7 @@ void AttribDeclaration::importAll(Scope *sc)
{
Scope *sc2 = newScope(sc);
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
s->importAll(sc2);
@@ -181,7 +181,7 @@ void AttribDeclaration::semantic(Scope *sc)
{
Scope *sc2 = newScope(sc);
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
s->semantic(sc2);
@@ -201,7 +201,7 @@ void AttribDeclaration::semantic2(Scope *sc)
{
Scope *sc2 = newScope(sc);
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
s->semantic2(sc2);
@@ -220,7 +220,7 @@ void AttribDeclaration::semantic3(Scope *sc)
{
Scope *sc2 = newScope(sc);
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
s->semantic3(sc2);
@@ -240,7 +240,7 @@ void AttribDeclaration::addComment(const utf8_t *comment)
if (d)
{
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
//printf("AttribDeclaration::addComment %s\n", s->toChars());
@@ -256,7 +256,7 @@ void AttribDeclaration::setFieldOffset(AggregateDeclaration *ad, unsigned *poffs
if (d)
{
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
s->setFieldOffset(ad, poffset, isunion);
@@ -270,7 +270,7 @@ bool AttribDeclaration::hasPointers()
if (d)
{
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
if (s->hasPointers())
@@ -286,7 +286,7 @@ bool AttribDeclaration::hasStaticCtorOrDtor()
if (d)
{
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
if (s->hasStaticCtorOrDtor())
@@ -314,7 +314,7 @@ void AttribDeclaration::checkCtorConstInit()
if (d)
{
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
s->checkCtorConstInit();
@@ -331,7 +331,7 @@ void AttribDeclaration::addLocalClass(ClassDeclarations *aclasses)
if (d)
{
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
s->addLocalClass(aclasses);
@@ -387,7 +387,7 @@ void StorageClassDeclaration::addMember(Scope *sc, ScopeDsymbol *sds)
if (d)
{
Scope *sc2 = newScope(sc);
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
//printf("\taddMember %s to %s\n", s->toChars(), sds->toChars());
@@ -767,7 +767,7 @@ void AnonDeclaration::semantic(Scope *sc)
sc->inunion = isunion;
sc->flags = 0;
- for (size_t i = 0; i < decl->dim; i++)
+ for (size_t i = 0; i < decl->length; i++)
{
Dsymbol *s = (*decl)[i];
s->semantic(sc);
@@ -787,7 +787,7 @@ void AnonDeclaration::setFieldOffset(AggregateDeclaration *ad, unsigned *poffset
* size and alignment.
*/
- size_t fieldstart = ad->fields.dim;
+ size_t fieldstart = ad->fields.length;
/* Hackishly hijack ad's structsize and alignsize fields
* for use in our fake anon aggregate member.
@@ -798,7 +798,7 @@ void AnonDeclaration::setFieldOffset(AggregateDeclaration *ad, unsigned *poffset
ad->alignsize = 0;
unsigned offset = 0;
- for (size_t i = 0; i < decl->dim; i++)
+ for (size_t i = 0; i < decl->length; i++)
{
Dsymbol *s = (*decl)[i];
s->setFieldOffset(ad, &offset, this->isunion);
@@ -810,7 +810,7 @@ void AnonDeclaration::setFieldOffset(AggregateDeclaration *ad, unsigned *poffset
* added in ad->fields, just update *poffset for the subsequent
* field offset calculation.
*/
- if (fieldstart == ad->fields.dim)
+ if (fieldstart == ad->fields.length)
{
ad->structsize = savestructsize;
ad->alignsize = savealignsize;
@@ -845,7 +845,7 @@ void AnonDeclaration::setFieldOffset(AggregateDeclaration *ad, unsigned *poffset
// Add to the anon fields the base offset of this anonymous aggregate
//printf("anon fields, anonoffset = %d\n", anonoffset);
- for (size_t i = fieldstart; i < ad->fields.dim; i++)
+ for (size_t i = fieldstart; i < ad->fields.length; i++)
{
VarDeclaration *v = ad->fields[i];
//printf("\t[%d] %s %d\n", i, v->toChars(), v->offset);
@@ -883,11 +883,11 @@ Scope *PragmaDeclaration::newScope(Scope *sc)
if (ident == Id::Pinline)
{
PINLINE inlining = PINLINEdefault;
- if (!args || args->dim == 0)
+ if (!args || args->length == 0)
inlining = PINLINEdefault;
- else if (args->dim != 1)
+ else if (args->length != 1)
{
- error("one boolean expression expected for pragma(inline), not %d", args->dim);
+ error("one boolean expression expected for pragma(inline), not %d", args->length);
args->setDim(1);
(*args)[0] = new ErrorExp();
}
@@ -925,8 +925,8 @@ static unsigned setMangleOverride(Dsymbol *s, char *sym)
Dsymbols *decls = ad->include(NULL, NULL);
unsigned nestedCount = 0;
- if (decls && decls->dim)
- for (size_t i = 0; i < decls->dim; ++i)
+ if (decls && decls->length)
+ for (size_t i = 0; i < decls->length; ++i)
nestedCount += setMangleOverride((*decls)[i], sym);
return nestedCount;
@@ -949,7 +949,7 @@ void PragmaDeclaration::semantic(Scope *sc)
{
if (args)
{
- for (size_t i = 0; i < args->dim; i++)
+ for (size_t i = 0; i < args->length; i++)
{
Expression *e = (*args)[i];
@@ -980,7 +980,7 @@ void PragmaDeclaration::semantic(Scope *sc)
}
else if (ident == Id::lib)
{
- if (!args || args->dim != 1)
+ if (!args || args->length != 1)
error("string expected for library name");
else
{
@@ -1012,7 +1012,7 @@ void PragmaDeclaration::semantic(Scope *sc)
}
else if (ident == Id::startaddress)
{
- if (!args || args->dim != 1)
+ if (!args || args->length != 1)
error("function name expected for start address");
else
{
@@ -1040,7 +1040,7 @@ void PragmaDeclaration::semantic(Scope *sc)
{
if (!args)
args = new Expressions();
- if (args->dim != 1)
+ if (args->length != 1)
{
error("string expected for mangled name");
args->setDim(1);
@@ -1113,7 +1113,7 @@ void PragmaDeclaration::semantic(Scope *sc)
buf.writestring(ident->toChars());
if (args)
{
- for (size_t i = 0; i < args->dim; i++)
+ for (size_t i = 0; i < args->length; i++)
{
Expression *e = (*args)[i];
@@ -1129,7 +1129,7 @@ void PragmaDeclaration::semantic(Scope *sc)
buf.writeByte(',');
buf.writestring(e->toChars());
}
- if (args->dim)
+ if (args->length)
buf.writeByte(')');
}
message("pragma %s", buf.peekString());
@@ -1144,7 +1144,7 @@ Ldecl:
{
Scope *sc2 = newScope(sc);
- for (size_t i = 0; i < decl->dim; i++)
+ for (size_t i = 0; i < decl->length; i++)
{
Dsymbol *s = (*decl)[i];
@@ -1152,7 +1152,7 @@ Ldecl:
if (ident == Id::mangle)
{
- assert(args && args->dim == 1);
+ assert(args && args->length == 1);
if (StringExp *se = (*args)[0]->toStringExp())
{
char *name = (char *)mem.xmalloc(se->len + 1);
@@ -1239,7 +1239,7 @@ void ConditionalDeclaration::setScope(Scope *sc)
//printf("\tConditionalDeclaration::setScope '%s', d = %p\n",toChars(), d);
if (d)
{
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
s->setScope(sc);
@@ -1263,7 +1263,7 @@ void ConditionalDeclaration::addComment(const utf8_t *comment)
{
if (d)
{
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
//printf("ConditionalDeclaration::addComment %s\n", s->toChars());
@@ -1318,14 +1318,14 @@ Dsymbols *StaticIfDeclaration::include(Scope *sc, ScopeDsymbol *)
if (d && !addisdone)
{
// Add members lazily.
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
s->addMember(_scope, scopesym);
}
// Set the member scopes lazily.
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
s->setScope(_scope);
@@ -1449,13 +1449,13 @@ Dsymbols *StaticForeachDeclaration::include(Scope *, ScopeDsymbol *)
if (d) // process generated declarations
{
// Add members lazily.
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
s->addMember(_scope, scopesym);
}
// Set the member scopes lazily.
- for (size_t i = 0; i < d->dim; i++)
+ for (size_t i = 0; i < d->length; i++)
{
Dsymbol *s = (*d)[i];
s->setScope(_scope);
@@ -1616,7 +1616,7 @@ void CompileDeclaration::semantic(Scope *sc)
if (_scope && decl)
{
- for (size_t i = 0; i < decl->dim; i++)
+ for (size_t i = 0; i < decl->length; i++)
{
Dsymbol *s = (*decl)[i];
s->setScope(_scope);
@@ -1652,7 +1652,7 @@ Dsymbol *UserAttributeDeclaration::syntaxCopy(Dsymbol *s)
Scope *UserAttributeDeclaration::newScope(Scope *sc)
{
Scope *sc2 = sc;
- if (atts && atts->dim)
+ if (atts && atts->length)
{
// create new one for changes
sc2 = sc->copy();
@@ -1681,7 +1681,7 @@ void UserAttributeDeclaration::semantic(Scope *sc)
static void udaExpressionEval(Scope *sc, Expressions *exps)
{
- for (size_t i = 0; i < exps->dim; i++)
+ for (size_t i = 0; i < exps->length; i++)
{
Expression *e = (*exps)[i];
if (e)
@@ -1701,7 +1701,7 @@ static void udaExpressionEval(Scope *sc, Expressions *exps)
void UserAttributeDeclaration::semantic2(Scope *sc)
{
- if (decl && atts && atts->dim && _scope)
+ if (decl && atts && atts->length && _scope)
{
_scope = NULL;
udaExpressionEval(sc, atts);
@@ -1713,9 +1713,9 @@ void UserAttributeDeclaration::semantic2(Scope *sc)
Expressions *UserAttributeDeclaration::concat(Expressions *udas1, Expressions *udas2)
{
Expressions *udas;
- if (!udas1 || udas1->dim == 0)
+ if (!udas1 || udas1->length == 0)
udas = udas2;
- else if (!udas2 || udas2->dim == 0)
+ else if (!udas2 || udas2->length == 0)
udas = udas1;
else
{
@@ -1740,7 +1740,7 @@ Expressions *UserAttributeDeclaration::getAttributes()
Expressions *exps = new Expressions();
if (userAttribDecl)
exps->push(new TupleExp(Loc(), userAttribDecl->getAttributes()));
- if (atts && atts->dim)
+ if (atts && atts->length)
exps->push(new TupleExp(Loc(), atts));
return exps;
generated by cgit v1.1 at 2025-05-30 15:33:44 +0000