diff options
Diffstat (limited to 'gcc/d/dmd/init.c')
| -rw-r--r-- | gcc/d/dmd/init.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/gcc/d/dmd/init.c b/gcc/d/dmd/init.c index 1b258ac..c4a496f 100644 --- a/gcc/d/dmd/init.c +++ b/gcc/d/dmd/init.c @@ -41,8 +41,8 @@ Initializers *Initializer::arraySyntaxCopy(Initializers *ai) if (ai) { a = new Initializers(); - a->setDim(ai->dim); - for (size_t i = 0; i < a->dim; i++) + a->setDim(ai->length); + for (size_t i = 0; i < a->length; i++) (*a)[i] = (*ai)[i]->syntaxCopy(); } return a; @@ -91,10 +91,10 @@ StructInitializer::StructInitializer(Loc loc) Initializer *StructInitializer::syntaxCopy() { StructInitializer *ai = new StructInitializer(loc); - assert(field.dim == value.dim); - ai->field.setDim(field.dim); - ai->value.setDim(value.dim); - for (size_t i = 0; i < field.dim; i++) + assert(field.length == value.length); + ai->field.setDim(field.length); + ai->value.setDim(value.length); + for (size_t i = 0; i < field.length; i++) { ai->field[i] = field[i]; ai->value[i] = value[i]->syntaxCopy(); @@ -123,10 +123,10 @@ Initializer *ArrayInitializer::syntaxCopy() { //printf("ArrayInitializer::syntaxCopy()\n"); ArrayInitializer *ai = new ArrayInitializer(loc); - assert(index.dim == value.dim); - ai->index.setDim(index.dim); - ai->value.setDim(value.dim); - for (size_t i = 0; i < ai->value.dim; i++) + assert(index.length == value.length); + ai->index.setDim(index.length); + ai->value.setDim(value.length); + for (size_t i = 0; i < ai->value.length; i++) { ai->index[i] = index[i] ? index[i]->syntaxCopy() : NULL; ai->value[i] = value[i]->syntaxCopy(); @@ -144,7 +144,7 @@ void ArrayInitializer::addInit(Expression *index, Initializer *value) bool ArrayInitializer::isAssociativeArray() { - for (size_t i = 0; i < value.dim; i++) + for (size_t i = 0; i < value.length; i++) { if (index[i]) return true; @@ -163,11 +163,11 @@ Expression *ArrayInitializer::toAssocArrayLiteral() //printf("ArrayInitializer::toAssocArrayInitializer()\n"); //static int i; if (++i == 2) halt(); Expressions *keys = new Expressions(); - keys->setDim(value.dim); + keys->setDim(value.length); Expressions *values = new Expressions(); - values->setDim(value.dim); + values->setDim(value.length); - for (size_t i = 0; i < value.dim; i++) + for (size_t i = 0; i < value.length; i++) { e = index[i]; if (!e) @@ -274,7 +274,7 @@ bool hasNonConstPointers(Expression *e) bool arrayHasNonConstPointers(Expressions *elems) { - for (size_t i = 0; i < elems->dim; i++) + for (size_t i = 0; i < elems->length; i++) { Expression *e = (*elems)[i]; if (e && hasNonConstPointers(e)) |