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(-)
This commit is contained in:
Leandro Lucarella
2010-01-06 15:18:22 -03:00
parent 6e61ecee6b
commit 4d74a325fc
10 changed files with 14 additions and 15 deletions
+3 -3
View File
@@ -4083,7 +4083,7 @@ Expression *VarExp::semantic(Scope *sc)
#if DMDV2
if (sc->func && sc->func->isPure() && !sc->intypeof)
{
if (v->isDataseg() && !v->isInvariant())
if (v->isDataseg() && !v->isImmutable())
error("pure function '%s' cannot access mutable static data '%s'", sc->func->toChars(), v->toChars());
}
#endif
@@ -4763,7 +4763,7 @@ Expression *IsExp::semantic(Scope *sc)
case TOKinvariant:
case TOKimmutable:
if (!targ->isInvariant())
if (!targ->isImmutable())
goto Lno;
tded = targ;
break;
@@ -7426,7 +7426,7 @@ void CastExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
case MODconst:
buf->writestring(Token::tochars[TOKconst]);
break;
case MODinvariant:
case MODimmutable:
buf->writestring(Token::tochars[TOKimmutable]);
break;
case MODshared: