Merge of DMD 2.062.

This commit is contained in:
kai
2013-03-06 18:18:56 +01:00
parent 0d908b45bb
commit bf52dbe389
65 changed files with 2964 additions and 2108 deletions
+2 -2
View File
@@ -1575,7 +1575,7 @@ Expression *ctfeIndex(Loc loc, Type *type, Expression *e1, uinteger_t indx)
{ StringExp *es1 = (StringExp *)e1;
if (indx >= es1->len)
{
error(loc, "string index %ju is out of bounds [0 .. %zu]", indx, es1->len);
error(loc, "string index %llu is out of bounds [0 .. %llu]", indx, (ulonglong)es1->len);
return EXP_CANT_INTERPRET;
}
else
@@ -1585,7 +1585,7 @@ Expression *ctfeIndex(Loc loc, Type *type, Expression *e1, uinteger_t indx)
ArrayLiteralExp *ale = (ArrayLiteralExp *)e1;
if (indx >= ale->elements->dim)
{
error(loc, "array index %ju is out of bounds %s[0 .. %u]", indx, e1->toChars(), ale->elements->dim);
error(loc, "array index %llu is out of bounds %s[0 .. %llu]", indx, e1->toChars(), (ulonglong)ale->elements->dim);
return EXP_CANT_INTERPRET;
}
Expression *e = ale->elements->tdata()[indx];