Changeset 789

Timestamp:

12/06/10 20:21:32 (14 years ago)

Author:

walter

Message:

bugzilla 2954 [tdpl] Appalling bug in associative arrays (D2 only)

Files:

• trunk/src/expression.c (modified) (1 diff)

trunk/src/expression.c

@@ -8588 +8588 @@
-            // Do compile time array bounds checking if possible
-            e2 = e2->optimize(WANTvalue);
-            if (e2->op == TOKint64)
-            {
-                dinteger_t index = e2->toInteger();
-                dinteger_t length = tsa->dim->toInteger();
-                if (index < 0 || index >= length)
-                    error("array index [%lld] is outside array bounds [0 .. %lld]",
-                            index, length);
-            }
-#endif
-            e->type = t1->nextOf();
-            break;
-        }
-
-        case Taarray:
-        {   TypeAArray *taa = (TypeAArray *)t1;
-            /* We can skip the implicit conversion if they differ only by
-             * constness (Bugzilla 2684, see also bug 2954b)
-             */
-
+WithoutCasting
-            {
-                e2 = e2->implicitCastTo(sc, taa->index);        // type checking
-            }
-            type = taa->next;
-            break;
-        }
-
-        case Ttuple:
-        {
-            e2 = e2->implicitCastTo(sc, Type::tsize_t);
-            e2 = e2->optimize(WANTvalue | WANTinterpret);
-            uinteger_t index = e2->toUInteger();
-            size_t length;
-            TupleExp *te;
-            TypeTuple *tup;
-
-            if (e1->op == TOKtuple)
-            {   te = (TupleExp *)e1;
-                length = te->exps->dim;
-            }