The R Project SVN R

Rev

Rev 48257 | Rev 51245 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 48257 Rev 51007
Line 1199... Line 1199...
1199
		warned = TRUE;
1199
		warned = TRUE;
1200
		warning("number of rows of result is not a multiple of vector length (arg %d)", n);
1200
		warning("number of rows of result is not a multiple of vector length (arg %d)", n);
1201
	    }
1201
	    }
1202
	    dn = getAttrib(u, R_NamesSymbol);
1202
	    dn = getAttrib(u, R_NamesSymbol);
1203
	    if (k >= lenmin && (TAG(t) != R_NilValue ||
1203
	    if (k >= lenmin && (TAG(t) != R_NilValue ||
-
 
1204
				(deparse_level == 2) ||
1204
				((deparse_level == 1) &&
1205
				((deparse_level == 1) &&
1205
				 isSymbol(substitute(CAR(t),R_NilValue)))))
1206
				 isSymbol(substitute(CAR(t),R_NilValue)))))
1206
		have_cnames = TRUE;
1207
		have_cnames = TRUE;
1207
	    nnames = imax2(nnames, length(dn));
1208
	    nnames = imax2(nnames, length(dn));
1208
	}
1209
	}
Line 1434... Line 1435...
1434
		warned = TRUE;
1435
		warned = TRUE;
1435
		warning("number of columns of result is not a multiple of vector length (arg %d)", n);
1436
		warning("number of columns of result is not a multiple of vector length (arg %d)", n);
1436
	    }
1437
	    }
1437
	    dn = getAttrib(u, R_NamesSymbol);
1438
	    dn = getAttrib(u, R_NamesSymbol);
1438
	    if (k >= lenmin && (TAG(t) != R_NilValue ||
1439
	    if (k >= lenmin && (TAG(t) != R_NilValue ||
-
 
1440
				(deparse_level == 2) ||
1439
		      ((deparse_level == 1) &&
1441
				((deparse_level == 1) &&
1440
		       isSymbol(substitute(CAR(t),R_NilValue)))))
1442
				 isSymbol(substitute(CAR(t),R_NilValue)))))
1441
		have_rnames = TRUE;
1443
		have_rnames = TRUE;
1442
	    nnames = imax2(nnames, length(dn));
1444
	    nnames = imax2(nnames, length(dn));
1443
	}
1445
	}
1444
    }
1446
    }
1445
    if (mnames || nnames == cols)
1447
    if (mnames || nnames == cols)