comparison dmd/template.c @ 876:27a379f288bf

Merged DMD 1.039
author Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date Wed, 07 Jan 2009 19:34:48 +0100
parents 330f999ade44
children 39519a1ff603
comparison
equal deleted inserted replaced
875:330f999ade44 876:27a379f288bf
3647 for (Dsymbol *p = isnested; p; p = p->parent) 3647 for (Dsymbol *p = isnested; p; p = p->parent)
3648 { 3648 {
3649 if (p == dparent) 3649 if (p == dparent)
3650 goto L1; // isnested is most nested 3650 goto L1; // isnested is most nested
3651 } 3651 }
3652 for (Dsymbol *p = dparent; 1; p = p->parent) 3652 for (Dsymbol *p = dparent; p; p = p->parent)
3653 { 3653 {
3654 if (p == isnested) 3654 if (p == isnested)
3655 { isnested = dparent; 3655 { isnested = dparent;
3656 goto L1; // dparent is most nested 3656 goto L1; // dparent is most nested
3657 } 3657 }
3658 } 3658 }
3659 error("is nested in both %s and %s", isnested->toChars(), dparent->toChars()); 3659 error("%s is nested in both %s and %s",
3660 toChars(), isnested->toChars(), dparent->toChars());
3660 } 3661 }
3661 L1: 3662 L1:
3662 //printf("\tnested inside %s\n", isnested->toChars()); 3663 //printf("\tnested inside %s\n", isnested->toChars());
3663 nested |= 1; 3664 nested |= 1;
3664 } 3665 }