Merge dmdfe 2.057

This commit is contained in:
Alexey Prokhin
2011-12-16 19:44:56 +04:00
parent 4e8afa8858
commit 88cff99bd4
32 changed files with 2518 additions and 1378 deletions
+2 -2
View File
@@ -47,8 +47,6 @@ void AliasThis::semantic(Scope *sc)
ad = parent->isAggregateDeclaration();
if (ad)
{
if (ad->aliasthis)
error("there can be only one alias this");
assert(ad->members);
Dsymbol *s = ad->search(loc, ident, 0);
if (!s)
@@ -58,6 +56,8 @@ void AliasThis::semantic(Scope *sc)
else
::error(loc, "undefined identifier %s", ident->toChars());
}
else if (ad->aliasthis && s != ad->aliasthis)
error("there can be only one alias this");
ad->aliasthis = s;
}
else