Merge branch 'clarify-tuple-length-error' of https://github.com/klick…

…verbot/dmd into kickverbot-clarify-tuple-length-error
dlang · Mar 26, 2011 · ad2e669 · ad2e669
2 parents b098d2d + c85be5e
commit ad2e669
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/iasm.c b/src/iasm.c
@@ -2001,7 +2001,7 @@ STATIC OPND *asm_merge_opnds(OPND *o1, OPND *o2)
 
             size_t index = o2->disp;
             if (index >= tup->objects->dim)
-                error(asmstate.loc, "tuple index %u exceeds %u", index, tup->objects->dim);
+                error(asmstate.loc, "tuple index %u exceeds length %u", index, tup->objects->dim);
             else
             {
                 Object *o = (Object *)tup->objects->data[index];

diff --git a/src/mtype.c b/src/mtype.c
@@ -3275,7 +3275,7 @@ void TypeSArray::resolve(Loc loc, Scope *sc, Expression **pe, Type **pt, Dsymbol
             sc = sc->pop();
 
             if (d >= td->objects->dim)
-            {   error(loc, "tuple index %ju exceeds %u", d, td->objects->dim);
+            {   error(loc, "tuple index %ju exceeds length %u", d, td->objects->dim);
                 goto Ldefault;
             }
             Object *o = (Object *)td->objects->data[(size_t)d];