D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-09-17 19:07:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated to 2.050

Browse Source
This commit is contained in:
Alexey Prokhin
2010-11-08 16:55:35 +03:00
parent d8e1d1feac
commit 6d22dd7999
25 changed files with 447 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dmd2/declaration.c
+19 -13
View File
@@ -1321,25 +1321,31 @@ Lagain:
}
else if (ei)
{
if (isDataseg())
/* static const/invariant does CTFE
*/
if (isDataseg() || (storage_class & STCmanifest))
e = e->optimize(WANTvalue | WANTinterpret);
else
e = e->optimize(WANTvalue);
if (e->op == TOKint64 || e->op == TOKstring || e->op == TOKfloat64)
switch (e->op)
{
ei->exp = e; // no errors, keep result
}
case TOKint64:
case TOKfloat64:
case TOKstring:
case TOKarrayliteral:
case TOKassocarrayliteral:
case TOKstructliteral:
case TOKnull:
ei->exp = e; // no errors, keep result
break;
default:
#if DMDV2
else
{
/* Save scope for later use, to try again
*/
scope = new Scope(*sc);
scope->setNoFree();
}
/* Save scope for later use, to try again
*/
scope = new Scope(*sc);
scope->setNoFree();
#endif
break;
}
}
else
init = i2; // no errors, keep result