Changeset 630

Timestamp:

08/27/10 05:52:21 (14 years ago)

Author:

walter

Message:

bugzilla 3935 - opBinary is instantiated with '='

Files:

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

trunk/src/opover.c

@@ -457 +457 @@
-
-    AggregateDeclaration *ad1 = isAggregate(e1->type);
-    AggregateDeclaration *ad2 = isAggregate(e2->type);
-
-    Dsymbol *s = NULL;
-    Dsymbol *s_r = NULL;
-
-#if 1 // the old D1 scheme
-    if (ad1 && id)
-    {
-        s = search_function(ad1, id);
-    }
-    if (ad2 && id_r)
-    {
-        s_r = search_function(ad2, id_r);
-    }
-#endif
-
-    Objects *targsi = NULL;
-#if DMDV2
-
+ && op != TOKassign
-    {   /* Try the new D2 scheme, opBinary and opBinaryRight
-         */
-        if (ad1)
-            s = search_function(ad1, Id::opBinary);
-        if (ad2)
-            s_r = search_function(ad2, Id::opBinaryRight);
-
-        // Set targsi, the template argument list, which will be the operator string
-        if (s || s_r)
-        {
-            id = Id::opBinary;
-            id_r = Id::opBinaryRight;
-            targsi = opToArg(sc, op);
-        }
-    }
-#endif
-
-    if (s || s_r)
-    {
-        /* Try: