Mercurial > projects > ddmd
diff dmd/CondExp.d @ 72:2e2a5c3f943a
reduced warnings by adding override to the methods
think this also normalizes different line endings used all over the place
author | Trass3r |
---|---|
date | Sat, 28 Aug 2010 16:19:48 +0200 |
parents | 4290d870944a |
children | e28b18c23469 |
line wrap: on
line diff
--- a/dmd/CondExp.d Sat Aug 28 16:14:07 2010 +0200 +++ b/dmd/CondExp.d Sat Aug 28 16:19:48 2010 +0200 @@ -38,12 +38,12 @@ this.econd = econd; } - Expression syntaxCopy() + override Expression syntaxCopy() { return new CondExp(loc, econd.syntaxCopy(), e1.syntaxCopy(), e2.syntaxCopy()); } - Expression semantic(Scope sc) + override Expression semantic(Scope sc) { Type t1; Type t2; @@ -138,7 +138,7 @@ return this; } - Expression optimize(int result) + override Expression optimize(int result) { Expression e; @@ -157,38 +157,38 @@ return e; } - Expression interpret(InterState istate) + override Expression interpret(InterState istate) { assert(false); } - void checkEscape() + override void checkEscape() { e1.checkEscape(); e2.checkEscape(); } - int isLvalue() + override int isLvalue() { assert(false); } - Expression toLvalue(Scope sc, Expression e) + override Expression toLvalue(Scope sc, Expression e) { assert(false); } - Expression modifiableLvalue(Scope sc, Expression e) + override Expression modifiableLvalue(Scope sc, Expression e) { assert(false); } - Expression checkToBoolean() + override Expression checkToBoolean() { assert(false); } - bool checkSideEffect(int flag) + override bool checkSideEffect(int flag) { if (flag == 2) { @@ -202,7 +202,7 @@ } } - void toCBuffer(OutBuffer buf, HdrGenState* hgs) + override void toCBuffer(OutBuffer buf, HdrGenState* hgs) { expToCBuffer(buf, hgs, econd, PREC_oror); buf.writestring(" ? "); @@ -211,7 +211,7 @@ expToCBuffer(buf, hgs, e2, PREC_cond); } - MATCH implicitConvTo(Type t) + override MATCH implicitConvTo(Type t) { MATCH m1 = e1.implicitConvTo(t); MATCH m2 = e2.implicitConvTo(t); @@ -221,7 +221,7 @@ return (m1 < m2) ? m1 : m2; } - Expression castTo(Scope sc, Type t) + override Expression castTo(Scope sc, Type t) { Expression e = this; @@ -238,22 +238,22 @@ return e; } - void scanForNestedRef(Scope sc) + override void scanForNestedRef(Scope sc) { assert(false); } - bool canThrow() + override bool canThrow() { return econd.canThrow() || e1.canThrow() || e2.canThrow(); } - int inlineCost(InlineCostState* ics) + override int inlineCost(InlineCostState* ics) { return 1 + e1.inlineCost(ics) + e2.inlineCost(ics) + econd.inlineCost(ics); } - Expression doInline(InlineDoState ids) + override Expression doInline(InlineDoState ids) { CondExp ce = cast(CondExp)copy(); @@ -263,7 +263,7 @@ return ce; } - Expression inlineScan(InlineScanState* iss) + override Expression inlineScan(InlineScanState* iss) { econd = econd.inlineScan(iss); e1 = e1.inlineScan(iss); @@ -271,7 +271,7 @@ return this; } - elem* toElem(IRState* irs) + override elem* toElem(IRState* irs) { elem* eleft; elem* eright; @@ -294,4 +294,4 @@ el_setLoc(e, loc); return e; } -} \ No newline at end of file +}