diff options
Diffstat (limited to 'gcc/d/dmd/hdrgen.c')
-rw-r--r-- | gcc/d/dmd/hdrgen.c | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/gcc/d/dmd/hdrgen.c b/gcc/d/dmd/hdrgen.c index e14d01e..156f4a6 100644 --- a/gcc/d/dmd/hdrgen.c +++ b/gcc/d/dmd/hdrgen.c @@ -130,7 +130,7 @@ public: void visit(CompoundStatement *s) { - for (size_t i = 0; i < s->statements->dim; i++) + for (size_t i = 0; i < s->statements->length; i++) { Statement *sx = (*s->statements)[i]; if (sx) @@ -141,7 +141,7 @@ public: void visit(CompoundDeclarationStatement *s) { bool anywritten = false; - for (size_t i = 0; i < s->statements->dim; i++) + for (size_t i = 0; i < s->statements->length; i++) { Statement *sx = (*s->statements)[i]; ExpStatement *ds = sx ? sx->isExpStatement() : NULL; @@ -167,7 +167,7 @@ public: buf->writenl(); buf->level++; - for (size_t i = 0; i < s->statements->dim; i++) + for (size_t i = 0; i < s->statements->length; i++) { Statement *sx = (*s->statements)[i]; if (sx) @@ -253,7 +253,7 @@ public: { buf->writestring(Token::toChars(s->op)); buf->writestring(" ("); - for (size_t i = 0; i < s->parameters->dim; i++) + for (size_t i = 0; i < s->parameters->length; i++) { Parameter *p = (*s->parameters)[i]; if (i) @@ -412,7 +412,7 @@ public: { buf->writestring("pragma ("); buf->writestring(s->ident->toChars()); - if (s->args && s->args->dim) + if (s->args && s->args->length) { buf->writestring(", "); argsToBuffer(s->args); @@ -584,7 +584,7 @@ public: buf->writenl(); if (s->_body) s->_body->accept(this); - for (size_t i = 0; i < s->catches->dim; i++) + for (size_t i = 0; i < s->catches->length; i++) { Catch *c = (*s->catches)[i]; visit(c); @@ -686,7 +686,7 @@ public: void visit(ImportStatement *s) { - for (size_t i = 0; i < s->imports->dim; i++) + for (size_t i = 0; i < s->imports->length; i++) { Dsymbol *imp = (*s->imports)[i]; imp->accept(this); @@ -979,7 +979,7 @@ public: if (td) { buf->writeByte('('); - for (size_t i = 0; i < td->origParameters->dim; i++) + for (size_t i = 0; i < td->origParameters->length; i++) { TemplateParameter *p = (*td->origParameters)[i]; if (i) @@ -1000,7 +1000,7 @@ public: void visitTypeQualifiedHelper(TypeQualified *t) { - for (size_t i = 0; i < t->idents.dim; i++) + for (size_t i = 0; i < t->idents.length; i++) { RootObject *id = t->idents[i]; @@ -1172,19 +1172,19 @@ public: { buf->printf("%s = ", imp->aliasId->toChars()); } - if (imp->packages && imp->packages->dim) + if (imp->packages && imp->packages->length) { - for (size_t i = 0; i < imp->packages->dim; i++) + for (size_t i = 0; i < imp->packages->length; i++) { Identifier *pid = (*imp->packages)[i]; buf->printf("%s.", pid->toChars()); } } buf->printf("%s", imp->id->toChars()); - if (imp->names.dim) + if (imp->names.length) { buf->writestring(" : "); - for (size_t i = 0; i < imp->names.dim; i++) + for (size_t i = 0; i < imp->names.length; i++) { if (i) buf->writestring(", "); @@ -1217,14 +1217,14 @@ public: return; } - if (d->decl->dim == 0) + if (d->decl->length == 0) buf->writestring("{}"); - else if (hgs->hdrgen && d->decl->dim == 1 && (*d->decl)[0]->isUnitTestDeclaration()) + else if (hgs->hdrgen && d->decl->length == 1 && (*d->decl)[0]->isUnitTestDeclaration()) { // hack for bugzilla 8081 buf->writestring("{}"); } - else if (d->decl->dim == 1) + else if (d->decl->length == 1) { ((*d->decl)[0])->accept(this); return; @@ -1235,7 +1235,7 @@ public: buf->writeByte('{'); buf->writenl(); buf->level++; - for (size_t i = 0; i < d->decl->dim; i++) + for (size_t i = 0; i < d->decl->length; i++) { Dsymbol *de = (*d->decl)[i]; de->accept(this); @@ -1326,7 +1326,7 @@ public: buf->level++; if (d->decl) { - for (size_t i = 0; i < d->decl->dim; i++) + for (size_t i = 0; i < d->decl->length; i++) { Dsymbol *de = (*d->decl)[i]; de->accept(this); @@ -1340,7 +1340,7 @@ public: void visit(PragmaDeclaration *d) { buf->printf("pragma (%s", d->ident->toChars()); - if (d->args && d->args->dim) + if (d->args && d->args->length) { buf->writestring(", "); argsToBuffer(d->args); @@ -1360,7 +1360,7 @@ public: buf->level++; if (d->decl) { - for (size_t i = 0; i < d->decl->dim; i++) + for (size_t i = 0; i < d->decl->length; i++) { Dsymbol *de = (*d->decl)[i]; de->accept(this); @@ -1376,7 +1376,7 @@ public: buf->writeByte('{'); buf->writenl(); buf->level++; - for (size_t i = 0; i < d->elsedecl->dim; i++) + for (size_t i = 0; i < d->elsedecl->length; i++) { Dsymbol *de = (*d->elsedecl)[i]; de->accept(this); @@ -1455,7 +1455,7 @@ public: buf->writeByte('{'); buf->writenl(); buf->level++; - for (size_t i = 0; i < d->members->dim; i++) + for (size_t i = 0; i < d->members->length; i++) { Dsymbol *s = (*d->members)[i]; s->accept(this); @@ -1469,7 +1469,7 @@ public: bool visitEponymousMember(TemplateDeclaration *d) { - if (!d->members || d->members->dim != 1) + if (!d->members || d->members->length != 1) return false; Dsymbol *onemember = (*d->members)[0]; @@ -1507,7 +1507,7 @@ public: buf->writeByte('{'); buf->writenl(); buf->level++; - for (size_t i = 0; i < ad->members->dim; i++) + for (size_t i = 0; i < ad->members->length; i++) { Dsymbol *s = (*ad->members)[i]; s->accept(this); @@ -1555,9 +1555,9 @@ public: } void visitTemplateParameters(TemplateParameters *parameters) { - if (!parameters || !parameters->dim) + if (!parameters || !parameters->length) return; - for (size_t i = 0; i < parameters->dim; i++) + for (size_t i = 0; i < parameters->length; i++) { TemplateParameter *p = (*parameters)[i]; if (i) @@ -1621,7 +1621,7 @@ public: return; } - if (ti->tiargs->dim == 1) + if (ti->tiargs->length == 1) { RootObject *oarg = (*ti->tiargs)[0]; if (Type *t = isType(oarg)) @@ -1631,7 +1631,7 @@ public: t->equals(Type::tdstring) || (t->mod == 0 && (t->isTypeBasic() || - (t->ty == Tident && ((TypeIdentifier *)t)->idents.dim == 0)))) + (t->ty == Tident && ((TypeIdentifier *)t)->idents.length == 0)))) { buf->writestring(t->toChars()); return; @@ -1652,7 +1652,7 @@ public: } buf->writeByte('('); ti->nest++; - for (size_t i = 0; i < ti->tiargs->dim; i++) + for (size_t i = 0; i < ti->tiargs->length; i++) { RootObject *arg = (*ti->tiargs)[i]; if (i) @@ -1695,7 +1695,7 @@ public: else if (Tuple *v = isTuple(oarg)) { Objects *args = &v->objects; - for (size_t i = 0; i < args->dim; i++) + for (size_t i = 0; i < args->length; i++) { RootObject *arg = (*args)[i]; if (i) @@ -1739,7 +1739,7 @@ public: buf->writeByte('{'); buf->writenl(); buf->level++; - for (size_t i = 0; i < d->members->dim; i++) + for (size_t i = 0; i < d->members->length; i++) { EnumMember *em = (*d->members)[i]->isEnumMember(); if (!em) @@ -1763,7 +1763,7 @@ public: buf->writeByte('{'); buf->writenl(); buf->level++; - for (size_t i = 0; i < d->members->dim; i++) + for (size_t i = 0; i < d->members->length; i++) { Dsymbol *s = (*d->members)[i]; s->accept(this); @@ -1788,7 +1788,7 @@ public: buf->writeByte('{'); buf->writenl(); buf->level++; - for (size_t i = 0; i < d->members->dim; i++) + for (size_t i = 0; i < d->members->length; i++) { Dsymbol *s = (*d->members)[i]; s->accept(this); @@ -1813,7 +1813,7 @@ public: buf->writeByte('{'); buf->writenl(); buf->level++; - for (size_t i = 0; i < d->members->dim; i++) + for (size_t i = 0; i < d->members->length; i++) { Dsymbol *s = (*d->members)[i]; s->accept(this); @@ -1828,11 +1828,11 @@ public: void visitBaseClasses(ClassDeclaration *d) { - if (!d || !d->baseclasses->dim) + if (!d || !d->baseclasses->length) return; buf->writestring(" : "); - for (size_t i = 0; i < d->baseclasses->dim; i++) + for (size_t i = 0; i < d->baseclasses->length; i++) { if (i) buf->writestring(", "); @@ -2018,7 +2018,7 @@ public: Statement *s1; if (f->semanticRun >= PASSsemantic3done && cs) { - s1 = (*cs->statements)[cs->statements->dim - 1]; + s1 = (*cs->statements)[cs->statements->length - 1]; } else s1 = !cs ? f->fbody : NULL; @@ -2141,7 +2141,7 @@ public: { //printf("StructInitializer::toCBuffer()\n"); buf->writeByte('{'); - for (size_t i = 0; i < si->field.dim; i++) + for (size_t i = 0; i < si->field.length; i++) { if (i) buf->writestring(", "); @@ -2159,7 +2159,7 @@ public: void visit(ArrayInitializer *ai) { buf->writeByte('['); - for (size_t i = 0; i < ai->index.dim; i++) + for (size_t i = 0; i < ai->index.length; i++) { if (i) buf->writestring(", "); @@ -2186,10 +2186,10 @@ public: */ void argsToBuffer(Expressions *expressions, Expression *basis = NULL) { - if (!expressions || !expressions->dim) + if (!expressions || !expressions->length) return; - for (size_t i = 0; i < expressions->dim; i++) + for (size_t i = 0; i < expressions->length; i++) { Expression *el = (*expressions)[i]; if (i) @@ -2277,7 +2277,7 @@ public: EnumDeclaration *sym = te->sym; if (inEnumDecl != sym) { - for (size_t i = 0; i < sym->members->dim; i++) + for (size_t i = 0; i < sym->members->length; i++) { EnumMember *em = (EnumMember *)(*sym->members)[i]; if (em->value()->toInteger() == v) @@ -2521,7 +2521,7 @@ public: void visit(AssocArrayLiteralExp *e) { buf->writeByte('['); - for (size_t i = 0; i < e->keys->dim; i++) + for (size_t i = 0; i < e->keys->length; i++) { Expression *key = (*e->keys)[i]; Expression *value = (*e->values)[i]; @@ -2598,14 +2598,14 @@ public: buf->writeByte('.'); } buf->writestring("new "); - if (e->newargs && e->newargs->dim) + if (e->newargs && e->newargs->length) { buf->writeByte('('); argsToBuffer(e->newargs); buf->writeByte(')'); } typeToBuffer(e->newtype, NULL); - if (e->arguments && e->arguments->dim) + if (e->arguments && e->arguments->length) { buf->writeByte('('); argsToBuffer(e->arguments); @@ -2621,14 +2621,14 @@ public: buf->writeByte('.'); } buf->writestring("new"); - if (e->newargs && e->newargs->dim) + if (e->newargs && e->newargs->length) { buf->writeByte('('); argsToBuffer(e->newargs); buf->writeByte(')'); } buf->writestring(" class "); - if (e->arguments && e->arguments->dim) + if (e->arguments && e->arguments->length) { buf->writeByte('('); argsToBuffer(e->arguments); @@ -2717,7 +2717,7 @@ public: buf->writestring(e->ident->toChars()); if (e->args) { - for (size_t i = 0; i < e->args->dim; i++) + for (size_t i = 0; i < e->args->length; i++) { RootObject *arg = (*e->args)[i]; buf->writestring(", "); @@ -2748,7 +2748,7 @@ public: buf->writestring(" == "); typeToBuffer(e->tspec, NULL); } - if (e->parameters && e->parameters->dim) + if (e->parameters && e->parameters->length) { buf->writestring(", "); visitTemplateParameters(e->parameters); @@ -3158,7 +3158,7 @@ public: } if (varargs) { - if (parameters->dim && varargs == 1) + if (parameters->length && varargs == 1) buf->writestring(", "); buf->writestring("..."); } @@ -3194,7 +3194,7 @@ public: buf->writeByte(';'); buf->writenl(); } - for (size_t i = 0; i < m->members->dim; i++) + for (size_t i = 0; i < m->members->length; i++) { Dsymbol *s = (*m->members)[i]; s->accept(this); @@ -3433,12 +3433,12 @@ void toCBuffer(Expression *e, OutBuffer *buf, HdrGenState *hgs) */ void argExpTypesToCBuffer(OutBuffer *buf, Expressions *arguments) { - if (!arguments || !arguments->dim) + if (!arguments || !arguments->length) return; HdrGenState hgs; PrettyPrintVisitor v(buf, &hgs); - for (size_t i = 0; i < arguments->dim; i++) + for (size_t i = 0; i < arguments->length; i++) { Expression *arg = (*arguments)[i]; if (i) @@ -3455,12 +3455,12 @@ void toCBuffer(TemplateParameter *tp, OutBuffer *buf, HdrGenState *hgs) void arrayObjectsToBuffer(OutBuffer *buf, Objects *objects) { - if (!objects || !objects->dim) + if (!objects || !objects->length) return; HdrGenState hgs; PrettyPrintVisitor v(buf, &hgs); - for (size_t i = 0; i < objects->dim; i++) + for (size_t i = 0; i < objects->length; i++) { RootObject *o = (*objects)[i]; if (i) |