intersect(colnamesInt(x, NULL), ans) --> sort(ans)

MichaelChirico · web-flow · commit c3a450d26e00 · 2025-07-01T11:36:22.000-07:00
diff --git a/R/mergelist.R b/R/mergelist.R
@@ -23,14 +23,16 @@ onkeys = function(x, y) {
   }
   NULL # nocov. Internal error is being called later in mergepair
 }
+
 someCols = function(x, cols, drop=character(), keep=character(), retain.order=FALSE) {
   keep = colnamesInt(x, keep)
   drop = colnamesInt(x, drop)
   cols = colnamesInt(x, cols)
   ans = union(keep, setdiff(cols, drop))
   if (!retain.order) return(ans)
-  intersect(colnamesInt(x, NULL), ans)
+  sort(ans)
 }
+
 hasindex = function(x, by, retGrp=FALSE) {
   index = attr(x, "index", TRUE)
   if (is.null(index)) return(FALSE)

Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,16 @@ onkeys = function(x, y) {`
`23`	`23`	`}`
`24`	`24`	`NULL # nocov. Internal error is being called later in mergepair`
`25`	`25`	`}`
	`26`	`+`
`26`	`27`	`someCols = function(x, cols, drop=character(), keep=character(), retain.order=FALSE) {`
`27`	`28`	`keep = colnamesInt(x, keep)`
`28`	`29`	`drop = colnamesInt(x, drop)`
`29`	`30`	`cols = colnamesInt(x, cols)`
`30`	`31`	`ans = union(keep, setdiff(cols, drop))`
`31`	`32`	`if (!retain.order) return(ans)`
`32`		`- intersect(colnamesInt(x, NULL), ans)`
	`33`	`+ sort(ans)`
`33`	`34`	`}`
	`35`	`+`
`34`	`36`	`hasindex = function(x, by, retGrp=FALSE) {`
`35`	`37`	`index = attr(x, "index", TRUE)`
`36`	`38`	`if (is.null(index)) return(FALSE)`