Merge DMD r286: remove dead code

---
 dmd/interpret.c |   49 ++-----------------------------------------------
 dmd/mars.c      |    2 +-
 2 files changed, 3 insertions(+), 48 deletions(-)
This commit is contained in:
Leandro Lucarella
2010-01-06 15:18:21 -03:00
parent ddb0f3f209
commit 4aec0677b7
2 changed files with 3 additions and 48 deletions

View File

@@ -500,53 +500,8 @@ Expression *WhileStatement::interpret(InterState *istate)
#if LOG
printf("WhileStatement::interpret()\n");
#endif
if (istate->start == this)
istate->start = NULL;
Expression *e;
if (istate->start)
{
e = body ? body->interpret(istate) : NULL;
if (istate->start)
return NULL;
if (e == EXP_CANT_INTERPRET)
return e;
if (e == EXP_BREAK_INTERPRET)
return NULL;
if (e && e != EXP_CONTINUE_INTERPRET)
return e;
}
while (1)
{
e = condition->interpret(istate);
if (e == EXP_CANT_INTERPRET)
break;
if (!e->isConst())
{ e = EXP_CANT_INTERPRET;
break;
}
if (e->isBool(TRUE))
{ e = body ? body->interpret(istate) : NULL;
if (e == EXP_CANT_INTERPRET)
break;
if (e == EXP_CONTINUE_INTERPRET)
continue;
if (e == EXP_BREAK_INTERPRET)
{ e = NULL;
break;
}
if (e)
break;
}
else if (e->isBool(FALSE))
{ e = NULL;
break;
}
else
assert(0);
}
return e;
assert(0); // rewritten to ForStatement
return NULL;
}
Expression *DoStatement::interpret(InterState *istate)

View File

@@ -58,7 +58,7 @@ Global::Global()
copyright = "Copyright (c) 1999-2009 by Digital Mars and Tomas Lindquist Olsen";
written = "written by Walter Bright and Tomas Lindquist Olsen";
version = "v1.053";
version = "v1.054";
ldc_version = LDC_REV;
llvm_version = LLVM_REV_STR;
global.structalign = 8;