Mercurial > projects > ldc
changeset 1613:8f50a13d09a0
Merge DMD r286: remove dead code
---
dmd/interpret.c | 49 ++-----------------------------------------------
dmd/mars.c | 2 +-
2 files changed, 3 insertions(+), 48 deletions(-)
author | Leandro Lucarella <llucax@gmail.com> |
---|---|
date | Wed, 06 Jan 2010 15:18:21 -0300 |
parents | 081c48283153 |
children | dbf7b54f542f |
files | dmd/interpret.c dmd/mars.c |
diffstat | 2 files changed, 3 insertions(+), 48 deletions(-) [+] |
line wrap: on
line diff
--- a/dmd/interpret.c Wed Jan 06 15:18:21 2010 -0300 +++ b/dmd/interpret.c Wed Jan 06 15:18:21 2010 -0300 @@ -500,53 +500,8 @@ #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)
--- a/dmd/mars.c Wed Jan 06 15:18:21 2010 -0300 +++ b/dmd/mars.c Wed Jan 06 15:18:21 2010 -0300 @@ -58,7 +58,7 @@ 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;