D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-04-12 06:49:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply StaticStructInit changes from [913] to dmd2/

Browse Source
This commit is contained in:
Christian Kamm
2009-02-03 18:00:17 +01:00
parent dc5944df99
commit 8726eefefa
5 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dmd2/interpret.c
View File

@@ -987,7 +987,7 @@ Expression *getVarExp(Loc loc, InterState *istate, Declaration *d)
{
Expression *e = EXP_CANT_INTERPRET;
VarDeclaration *v = d->isVarDeclaration();
SymbolDeclaration *s = d->isSymbolDeclaration();
StaticStructInitDeclaration *s = d->isStaticStructInitDeclaration();
if (v)
{
#if DMDV2
@@ -1011,11 +1011,9 @@ Expression *getVarExp(Loc loc, InterState *istate, Declaration *d)
}
else if (s)
{
if (s->dsym->toInitializer() == s->sym)
{ Expressions *exps = new Expressions();
e = new StructLiteralExp(0, s->dsym, exps);
e = e->semantic(NULL);
}
Expressions *exps = new Expressions();
e = new StructLiteralExp(0, s->dsym, exps);
e = e->semantic(NULL);
}
return e;
}
@@ -1466,10 +1464,10 @@ Expression *BinExp::interpretAssignCommon(InterState *istate, fp_t fp, int post)
if (v->value && v->value->op == TOKvar)
{
VarExp *ve2 = (VarExp *)v->value;
if (ve2->var->isSymbolDeclaration())
if (ve2->var->isStaticStructInitDeclaration())
{
/* This can happen if v is a struct initialized to
* 0 using an __initZ SymbolDeclaration from
* 0 using an StaticStructInitDeclaration from
* TypeStruct::defaultInit()
*/
}