The R Project SVN – R – Diff – /trunk/src/main/array.c

     int ldx, ldy, nrx, ncx, nry, ncy, mode;
     SEXP x = CAR(args), y = CADR(args), xdims, ydims, ans;
     Rboolean sym;
     if (PRIMVAL(op) == 0 && /* %*% is primitive, the others are .Internal() */
-       (IS_S4_OBJECT(x) || IS_S4_OBJECT(y))
+	(OBJECT(x) || OBJECT(y))) {
-       && R_has_methods(op)) {
 	SEXP s, value;
 	/* Remove argument names to ensure positional matching */
 	for(s = args; s != R_NilValue; s = CDR(s)) SET_TAG(s, R_NilValue);
+	if ((IS_S4_OBJECT(x) || IS_S4_OBJECT(y)) && R_has_methods(op)){
-	value = R_possible_dispatch(call, op, args, rho, FALSE);
+	    value = R_possible_dispatch(call, op, args, rho, FALSE);
-	if (value) return value;
+	    if (value) return value;
+	}
+	else if (DispatchGroup("matrixOps", call, op, args, rho, &ans))
+	    return ans;
+    }
     checkArity(op, args);
     sym = isNull(y);
     if (sym && (PRIMVAL(op) > 0)) y = x;

The R Project SVN R