Changeset 787

Timestamp:

12/06/10 08:48:16 (14 years ago)

Author:

walter

Message:

bugzilla 5020 Forward implicit bool conversions to alias this

Files:

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

trunk/src/expression.c

@@ -1250 +1250 @@
-{
-    // Default is 'yes' - do nothing
-
-#ifdef DEBUG
-    if (!type)
-        dump(0);
-#endif
-
-    // Structs can be converted to bool using opCast(bool)()
-    Type *tb = type->toBasetype();
-    if (tb->ty == Tstruct)
-    {   AggregateDeclaration *ad = ((TypeStruct *)tb)->sym;
-        /* Don't really need to check for opCast first, but by doing so we
-         * get better error messages if it isn't there.
-         */
-        Dsymbol *fd = search_function(ad, Id::cast);
-        if (fd)
-        {
-            Expression *e = new CastExp(loc, this, Type::tbool);
-            e = e->semantic(sc);
+            return e;
+        }
+
+        // Forward to aliasthis.
+        if (ad->aliasthis)
+        {
+            Expression *e = new DotIdExp(loc, this, ad->aliasthis->ident);
+            e = e->semantic(sc);
+            e = e->checkToBoolean(sc);
-            return e;
-        }
-    }
-
-    if (!type->checkBoolean())
-    {   if (type->toBasetype() != Type::terror)
-            error("expression %s of type %s does not have a boolean value", toChars(), type->toChars());
-        return new ErrorExp();
-    }
-    return this;
-}
-
-/****************************
- */
-
-Expression *Expression::checkToPointer()
-{
-    //printf("Expression::checkToPointer()\n");
-    Expression *e = this;
-