View | Details | Raw Unified | Return to bug 17300 | Differences between
and this patch

Collapse All | Expand All

(-)R/cbind.R (-2 / +2 lines)
Lines 98-106 Link Here
98
    d2 <- dim(r)
98
    d2 <- dim(r)
99
    r <- cbind2(argl[[i]], r)
99
    r <- cbind2(argl[[i]], r)
100
    ## if(deparse.level == 0)
100
    ## if(deparse.level == 0)
101
    ##     next
101
    ##     if(i == 1L) return(r) else next
102
    ism1 <- !is.null(d1 <- dim(argl[[i]])) && length(d1) == 2L
102
    ism1 <- !is.null(d1 <- dim(argl[[i]])) && length(d1) == 2L
103
    ism2 <- !is.null(d2)                   && length(d2) == 2L && !fix.na
103
    ism2 <- !is.null(d2)                   && length(d2) == 2L
104
    if(ism1 && ism2) ## two matrices
104
    if(ism1 && ism2) ## two matrices
105
	next
105
	next
106
106
(-)R/rbind.R (-3 / +3 lines)
Lines 87-102 Link Here
87
    d2 <- dim(r)
87
    d2 <- dim(r)
88
    r <- rbind2(argl[[i]], r)
88
    r <- rbind2(argl[[i]], r)
89
    ## if(deparse.level == 0)
89
    ## if(deparse.level == 0)
90
    ##     next
90
    ##     if(i == 1L) return(r) else next
91
    ism1 <- !is.null(d1 <- dim(argl[[i]])) && length(d1) == 2L
91
    ism1 <- !is.null(d1 <- dim(argl[[i]])) && length(d1) == 2L
92
    ism2 <- !is.null(d2)                   && length(d2) == 2L && !fix.na
92
    ism2 <- !is.null(d2)                   && length(d2) == 2L
93
    if(ism1 && ism2) ## two matrices
93
    if(ism1 && ism2) ## two matrices
94
	next
94
	next
95
95
96
    ## else -- Setting rownames correctly
96
    ## else -- Setting rownames correctly
97
    ##	       when one was not a matrix [needs some diligence!]
97
    ##	       when one was not a matrix [needs some diligence!]
98
    nn1 <- !is.null(N1 <- if(       (l1 <- Nrow(argl[[i]])) && !ism1) Nms(i)) # else NULL
98
    nn1 <- !is.null(N1 <- if(       (l1 <- Nrow(argl[[i]])) && !ism1) Nms(i)) # else NULL
99
    nn2 <- !is.null(N2 <- if(i == na-1L && Nrow(argl[[na]]) && !ism2) Nms(2))
99
    nn2 <- !is.null(N2 <- if(i == na-1L && Nrow(argl[[na]]) && !ism2) Nms(na))
100
    if(nn1 || nn2) {
100
    if(nn1 || nn2) {
101
	if(is.null(rownames(r)))
101
	if(is.null(rownames(r)))
102
	    rownames(r) <- rep.int("", nrow(r))
102
	    rownames(r) <- rep.int("", nrow(r))

Return to bug 17300