Changeset 232

Timestamp:

11/01/09 05:24:14 (15 years ago)

Author:

walter

Message:

bugzilla 3432

Files:

• branches/dmd-1.x/src/expression.c (modified) (1 diff)
• trunk/src/expression.c (modified) (1 diff)

branches/dmd-1.x/src/expression.c

@@ -7108 +7108 @@
-#if LOGSEMANTIC
-    printf("CastExp::semantic('%s')\n", toChars());
-#endif
-
-//static int x; assert(++x < 10);
-
-    if (type)
-    return this;
-    UnaExp::semantic(sc);
-    if (e1->type)       // if not a tuple
-    {
-    e1 = resolveProperties(sc, e1);
-    to = to->semantic(loc, sc);
-
-    e = op_overload(sc);
-    if (e)
-    {
-        return e->implicitCastTo(sc, to);
-    }
-
+    if (e1->op == TOKtemplate)
+    {
+        error("cannot cast template %s to type %s", e1->toChars(), to->toChars());
+        return new ErrorExp();
+    }
+
-    Type *t1b = e1->type->toBasetype();
-    Type *tob = to->toBasetype();
-    if (tob->ty == Tstruct &&
-        !tob->equals(t1b) &&
-        ((TypeStruct *)to)->sym->search(0, Id::call, 0)
-       )
-    {
-        /* Look to replace:
-         *  cast(S)t
-         * with:
-         *  S(t)
-         */
-
-        // Rewrite as to.call(e1)
-        e = new TypeExp(loc, to);
-        e = new DotIdExp(loc, e, Id::call);
-        e = new CallExp(loc, e, e1);
-        e = e->semantic(sc);
-        return e;
-    }

trunk/src/expression.c

@@ -7434 +7434 @@
-    e1 = resolveProperties(sc, e1);
-
-    if (!to)
-    {
-        /* Handle cast(const) and cast(immutable), etc.
-         */
-        to = e1->type->castMod(mod);
-    }
-    else
-        to = to->semantic(loc, sc);
-
-    if (!to->equals(e1->type))
-    {
-        e = op_overload(sc);
-        if (e)
-        {
-        return e->implicitCastTo(sc, to);
-        }
-    }
-
+    if (e1->op == TOKtemplate)
+    {
+        error("cannot cast template %s to type %s", e1->toChars(), to->toChars());
+        return new ErrorExp();
+    }
+
-    Type *t1b = e1->type->toBasetype();
-    Type *tob = to->toBasetype();
-    if (tob->ty == Tstruct &&
-        !tob->equals(t1b) &&
-        ((TypeStruct *)tob)->sym->search(0, Id::call, 0)
-       )
-    {
-        /* Look to replace:
-         *  cast(S)t
-         * with:
-         *  S(t)
-         */
-
-        // Rewrite as to.call(e1)
-        e = new TypeExp(loc, to);
-        e = new DotIdExp(loc, e, Id::call);
-        e = new CallExp(loc, e, e1);
-        e = e->semantic(sc);
-        return e;
-    }