Mercurial > projects > ldc

diff dmd/interpret.c @ 1619:c61782a76dff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge DMD r304: refactor invariant => immutable --- dmd/cast.c | 2 +- dmd/declaration.c | 2 +- dmd/declaration.h | 3 +-- dmd/doc.c | 2 +- dmd/expression.c | 6 +++--- dmd/interpret.c | 4 ++-- dmd/mtype.c | 2 +- dmd/mtype.h | 2 +- dmd/parse.c | 4 ++-- dmd/struct.c | 2 +- 10 files changed, 14 insertions(+), 15 deletions(-)
author Leandro Lucarella <llucax@gmail.com>
date Wed, 06 Jan 2010 15:18:22 -0300
parents 8f50a13d09a0
children 0333945a915e
line wrap: on
line diff
--- a/dmd/interpret.c	Wed Jan 06 15:18:21 2010 -0300
+++ b/dmd/interpret.c	Wed Jan 06 15:18:22 2010 -0300
@@ -993,7 +993,7 @@
     if (v)
     {
 #if DMDV2
-	if ((v->isConst() || v->isInvariant() || v->storage_class & STCmanifest) && v->init && !v->value)
+	if ((v->isConst() || v->isImmutable() || v->storage_class & STCmanifest) && v->init && !v->value)
 #else
 	if (v->isConst() && v->init)
 #endif
@@ -1051,7 +1051,7 @@
 		e = NULL;
 	}
 #if DMDV2
-	else if (s == v && (v->isConst() || v->isInvariant()) && v->init)
+	else if (s == v && (v->isConst() || v->isImmutable()) && v->init)
 #else
 	else if (s == v && v->isConst() && v->init)
 #endif