Mercurial > projects > ddmd
comparison dmd/OrOrExp.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 | cab4c37afb89 |
children | e28b18c23469 |
comparison
equal
deleted
inserted
replaced
71:8e24ef1dd139 | 72:2e2a5c3f943a |
---|---|
26 this(Loc loc, Expression e1, Expression e2) | 26 this(Loc loc, Expression e1, Expression e2) |
27 { | 27 { |
28 super(loc, TOK.TOKoror, OrOrExp.sizeof, e1, e2); | 28 super(loc, TOK.TOKoror, OrOrExp.sizeof, e1, e2); |
29 } | 29 } |
30 | 30 |
31 Expression semantic(Scope sc) | 31 override Expression semantic(Scope sc) |
32 { | 32 { |
33 uint cs1; | 33 uint cs1; |
34 | 34 |
35 // same as for AndAnd | 35 // same as for AndAnd |
36 e1 = e1.semantic(sc); | 36 e1 = e1.semantic(sc); |
61 if (e2.op == TOKtype || e2.op == TOKimport) | 61 if (e2.op == TOKtype || e2.op == TOKimport) |
62 error("%s is not an expression", e2.toChars()); | 62 error("%s is not an expression", e2.toChars()); |
63 return this; | 63 return this; |
64 } | 64 } |
65 | 65 |
66 Expression checkToBoolean() | 66 override Expression checkToBoolean() |
67 { | 67 { |
68 e2 = e2.checkToBoolean(); | 68 e2 = e2.checkToBoolean(); |
69 return this; | 69 return this; |
70 } | 70 } |
71 | 71 |
72 int isBit() | 72 override int isBit() |
73 { | 73 { |
74 assert(false); | 74 assert(false); |
75 } | 75 } |
76 | 76 |
77 Expression optimize(int result) | 77 override Expression optimize(int result) |
78 { | 78 { |
79 Expression e; | 79 Expression e; |
80 | 80 |
81 e1 = e1.optimize(WANTflags | (result & WANTinterpret)); | 81 e1 = e1.optimize(WANTflags | (result & WANTinterpret)); |
82 e = this; | 82 e = this; |
106 } | 106 } |
107 } | 107 } |
108 return e; | 108 return e; |
109 } | 109 } |
110 | 110 |
111 Expression interpret(InterState istate) | 111 override Expression interpret(InterState istate) |
112 { | 112 { |
113 assert(false); | 113 assert(false); |
114 } | 114 } |
115 | 115 |
116 bool checkSideEffect(int flag) | 116 override bool checkSideEffect(int flag) |
117 { | 117 { |
118 if (flag == 2) | 118 if (flag == 2) |
119 { | 119 { |
120 return e1.checkSideEffect(2) || e2.checkSideEffect(2); | 120 return e1.checkSideEffect(2) || e2.checkSideEffect(2); |
121 } | 121 } |
124 e1.checkSideEffect(1); | 124 e1.checkSideEffect(1); |
125 return e2.checkSideEffect(flag); | 125 return e2.checkSideEffect(flag); |
126 } | 126 } |
127 } | 127 } |
128 | 128 |
129 elem* toElem(IRState* irs) | 129 override elem* toElem(IRState* irs) |
130 { | 130 { |
131 elem* e = toElemBin(irs,OPoror); | 131 elem* e = toElemBin(irs,OPoror); |
132 if (global.params.cov && e2.loc.linnum) | 132 if (global.params.cov && e2.loc.linnum) |
133 e.E2() = el_combine(incUsageElem(irs, e2.loc), e.E2); | 133 e.E2() = el_combine(incUsageElem(irs, e2.loc), e.E2); |
134 return e; | 134 return e; |