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

 	x = CAR(args);
 	y = CADR(args);
 	xdims = getAttrib(x, R_DimSymbol);
 	ydims = getAttrib(y, R_DimSymbol);
-	ldx = LENGTH(xdims);
+	ldx = length(xdims);
-	ldy = LENGTH(ydims);
+	ldy = length(ydims);
 	if (ldx != 2 && ldy != 2) {
 		if(PRIMVAL(op) == 0) {
 			nrx = 1;
 			ncx = LENGTH(x);
 		if(PRIMVAL(op) == 0) {
 			if(LENGTH(x) == nry) {
 				nrx = 1;
 				ncx = LENGTH(x);
+			}
+			if( nry*ncy == 1 ) {
+				nrx = LENGTH(x);
+				ncx = 1;
+			}
+		}
 		else {
 			if(LENGTH(x) == nry) {
 				nrx = LENGTH(x);
 				ncx = 1;
 		if(PRIMVAL(op) == 0) {
 			if (LENGTH(y) == ncx) {
 				nry = LENGTH(y);
 				ncy = 1;
+			}
+			if ( nrx*ncx == 1 ) {
+				ncy = LENGTH(y);
+				nry = 1;
+			}
+		}
 		else {
 			if (LENGTH(y) == nrx) {
 				nry = LENGTH(y);
 				ncy = 1;

The R Project SVN R