Mercurial > projects > ldc
diff dmd/expression.c @ 1619:c61782a76dff
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 | a87f1d6ff48e |
| children | fb2e6707ad17 |
line wrap: on
line diff
--- a/dmd/expression.c Wed Jan 06 15:18:21 2010 -0300 +++ b/dmd/expression.c Wed Jan 06 15:18:22 2010 -0300 @@ -4083,7 +4083,7 @@ #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 @@ case TOKinvariant: case TOKimmutable: - if (!targ->isInvariant()) + if (!targ->isImmutable()) goto Lno; tded = targ; break; @@ -7426,7 +7426,7 @@ case MODconst: buf->writestring(Token::tochars[TOKconst]); break; - case MODinvariant: + case MODimmutable: buf->writestring(Token::tochars[TOKimmutable]); break; case MODshared: