Mercurial > projects > ldc

comparison dmd/parse.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 207a8a438dea
children
comparison
equal deleted inserted replaced
1618:a87f1d6ff48e 1619:c61782a76dff
220 #else 220 #else
221 if (peek(&token)->value == TOKlcurly) 221 if (peek(&token)->value == TOKlcurly)
222 s = parseInvariant(); 222 s = parseInvariant();
223 else 223 else
224 { 224 {
225 stc = STCinvariant; 225 stc = STCimmutable;
226 goto Lstc; 226 goto Lstc;
227 } 227 }
228 #endif 228 #endif
229 break; 229 break;
230 230
301 case TOKscope: stc |= STCscope; goto Lstc; 301 case TOKscope: stc |= STCscope; goto Lstc;
302 case TOKoverride: stc |= STCoverride; goto Lstc; 302 case TOKoverride: stc |= STCoverride; goto Lstc;
303 case TOKabstract: stc |= STCabstract; goto Lstc; 303 case TOKabstract: stc |= STCabstract; goto Lstc;
304 case TOKsynchronized: stc |= STCsynchronized; goto Lstc; 304 case TOKsynchronized: stc |= STCsynchronized; goto Lstc;
305 case TOKdeprecated: stc |= STCdeprecated; goto Lstc; 305 case TOKdeprecated: stc |= STCdeprecated; goto Lstc;
306 //case TOKinvariant: stc |= STCinvariant; goto Lstc; 306 //case TOKinvariant: stc |= STCimmutable; goto Lstc;
307 default: 307 default:
308 break; 308 break;
309 } 309 }
310 310
311 /* Look for auto initializers: 311 /* Look for auto initializers: