Mercurial > projects > ldc
comparison dmd/template.c @ 1630:44b145be2ef5
Merge dmd 1.056.
author | Robert Clipsham <robert@octarineparrot.com> |
---|---|
date | Sat, 06 Feb 2010 15:53:52 +0000 |
parents | a87f1d6ff48e |
children | 9bf06e02070b |
comparison
equal
deleted
inserted
replaced
1629:b07d683ba4d0 | 1630:44b145be2ef5 |
---|---|
1 | 1 |
2 // Compiler implementation of the D programming language | 2 // Compiler implementation of the D programming language |
3 // Copyright (c) 1999-2009 by Digital Mars | 3 // Copyright (c) 1999-2010 by Digital Mars |
4 // All Rights Reserved | 4 // All Rights Reserved |
5 // written by Walter Bright | 5 // written by Walter Bright |
6 // http://www.digitalmars.com | 6 // http://www.digitalmars.com |
7 // License for redistribution is by either the Artistic License | 7 // License for redistribution is by either the Artistic License |
8 // in artistic.txt, or the GNU General Public License in gnu.txt. | 8 // in artistic.txt, or the GNU General Public License in gnu.txt. |
3537 if (global.errors != errorsave) | 3537 if (global.errors != errorsave) |
3538 { | 3538 { |
3539 error("error instantiating"); | 3539 error("error instantiating"); |
3540 if (tinst) | 3540 if (tinst) |
3541 { tinst->printInstantiationTrace(); | 3541 { tinst->printInstantiationTrace(); |
3542 fatal(); | 3542 if (!global.gag) |
3543 fatal(); | |
3543 } | 3544 } |
3544 errors = 1; | 3545 errors = 1; |
3545 if (global.gag) | 3546 if (global.gag) |
3546 tempdecl->instances.remove(tempdecl_instance_idx); | 3547 tempdecl->instances.remove(tempdecl_instance_idx); |
3547 } | 3548 } |