--- a/gen/CodeGen.d	Fri May 02 20:17:22 2008 +0200
+++ b/gen/CodeGen.d	Fri May 02 20:18:50 2008 +0200
@@ -503,12 +503,22 @@
                 return b.buildLoad(target, "deref");
             case ExpType.Index:
                 auto indexExp = cast(IndexExp)exp;
-                auto array = getPointer(indexExp.target);
+                auto type = indexExp.target.type;
                 auto index = genExpression(indexExp.index);
                 Value[2] gep_indices;
                 gep_indices[0] = ConstantInt.Get(IntegerType.Int32, 0, false);
                 gep_indices[1] = index;
-                return b.buildGEP(array, gep_indices[], "index");
+                if (type.isArray())
+                {
+                    auto array = getPointer(indexExp.target);
+                    return b.buildGEP(array, gep_indices[0 .. 2], "index");
+                }
+                else if (type.isPointer())
+                {
+                    auto array = genExpression(indexExp.target);
+                    return b.buildGEP(array, gep_indices[1 .. 2], "index");
+                }
+                else assert(0, "Can only index pointers and arrays");
             case ExpType.MemberReference:
                 auto mem = cast(MemberReference)exp;
                 Stdout(mem.target).newline;