Mercurial > projects > ddmd
diff dmd/AssocArrayLiteralExp.d @ 84:be2ab491772e
Expressions -> Vector!Expression
author | Eldar Insafutdinov <e.insafutdinov@gmail.com> |
---|---|
date | Mon, 30 Aug 2010 16:12:19 +0100 |
parents | 2e2a5c3f943a |
children | 39648eb578f6 |
line wrap: on
line diff
--- a/dmd/AssocArrayLiteralExp.d Mon Aug 30 18:42:04 2010 +0400 +++ b/dmd/AssocArrayLiteralExp.d Mon Aug 30 16:12:19 2010 +0100 @@ -65,8 +65,8 @@ key = key.semantic(sc); value = value.semantic(sc); - keys.data[i] = cast(void *)key; - values.data[i] = cast(void *)value; + keys.data[i] = key; + values.data[i] = value; } expandTuples(keys); expandTuples(values); @@ -91,13 +91,13 @@ tkey = key.type; else key = key.implicitCastTo(sc, tkey); - keys.data[i] = cast(void *)key; + keys.data[i] = key; if (!tvalue) tvalue = value.type; else value = value.implicitCastTo(sc, tvalue); - values.data[i] = cast(void *)value; + values.data[i] = value; } if (!tkey) @@ -228,11 +228,11 @@ Expression e = cast(Expression)keys.data[i]; e = e.optimize(WANTvalue | (result & WANTinterpret)); - keys.data[i] = cast(void*)e; + keys.data[i] = e; e = cast(Expression)values.data[i]; e = e.optimize(WANTvalue | (result & WANTinterpret)); - values.data[i] = cast(void*)e; + values.data[i] = e; } return this; } @@ -261,7 +261,7 @@ { if (keysx == keys) keysx = cast(Expressions)keys.copy(); - keysx.data[i] = cast(void*)ex; + keysx.data[i] = ex; } ex = evalue.interpret(istate); @@ -273,8 +273,8 @@ if (ex != evalue) { if (valuesx == values) - valuesx = cast(Expressions)values.copy(); - valuesx.data[i] = cast(void*)ex; + valuesx = values.copy(); + valuesx.data[i] = ex; } } @@ -375,11 +375,11 @@ { Expression ex = cast(Expression)values.data[i]; ex = ex.castTo(sc, tb.nextOf()); - e.values.data[i] = cast(void*)ex; + e.values.data[i] = ex; ex = cast(Expression)keys.data[i]; ex = ex.castTo(sc, (cast(TypeAArray)tb).index); - e.keys.data[i] = cast(void*)ex; + e.keys.data[i] = ex; } e.type = t; return e;