Commitfb90b3a

conig

committed

add replacement for tidyselect::vars_select

1 parent212cb17 commitfb90b3aCopy full SHA for fb90b3a

File tree

+39

-7

lines changed

+39

-7

lines changed

Lines changed: 7 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -106,9 +106,9 @@ corx <-`
`106`	`106`	`data<-data.frame(data,check.names=FALSE)`
`107`	`107`	`}`
`108`	`108`
`109`		`-x<-tidyselect::vars_select(colnames(data), {{x }},.strict=TRUE)`
`110`		`-y<-tidyselect::vars_select(colnames(data), {{y }},.strict=TRUE)`
`111`		`-z<-tidyselect::vars_select(colnames(data), {{z }},.strict=TRUE)`
	`109`	`+x<-eval_select_names(colnames(data), {{x }},strict=TRUE)`
	`110`	`+y<-eval_select_names(colnames(data), {{y }},strict=TRUE)`
	`111`	`+z<-eval_select_names(colnames(data), {{z }},strict=TRUE)`
`112`	`112`
`113`	`113`	`# allow rename within select`
`114`	`114`	`data<- rename_if_needed(data,x)`
`@@ -197,10 +197,10 @@ corx <-`
`197`	`197`	`tryCatch(`
`198`	`198`	`{`
`199`	`199`	`# allow lists to be sent to tidyselect`
`200`		`-describe_name<-tidyselect::vars_select(`
	`200`	`+describe_name<-eval_select_names(`
`201`	`201`	`names(all_desc),`
`202`	`202`	`{{describe }},`
`203`		`-.strict=F`
	`203`	`+strict=FALSE`
`204`	`204`	`)`
`205`	`205`	`},`
`206`	`206`	`error=function(e) assign("describe_name", c(),envir=env)`
`@@ -211,10 +211,10 @@ corx <-`
`211`	`211`
`212`	`212`	`if (length(describe_name)!= (length(call$describe)-1)) {`
`213`	`213`	`# check if all vars were found`
`214`		`-describe_name<-tidyselect::vars_select(`
	`214`	`+describe_name<-eval_select_names(`
`215`	`215`	`names(all_desc),`
`216`	`216`	`{{describe }},`
`217`		`-.strict=T`
	`217`	`+strict=TRUE`
`218`	`218`	`)`
`219`	`219`	`}`
`220`	`220`

Lines changed: 32 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,32 @@`
	`1`	`+# replacement for tisyselect::vars_select`
	`2`	`+eval_select_names<-function(`
	`3`	`+vars,`
	`4`	`+expr,`
	`5`	`+strict=TRUE,`
	`6`	`+allow_predicates=TRUE`
	`7`	`+) {`
	`8`	`+quo<-rlang::enquo(expr)`
	`9`	`+`
	`10`	`+if (rlang::quo_is_null(quo)) {`
	`11`	`+return(character())`
	`12`	`+ }`
	`13`	`+`
	`14`	`+data_mask<-stats::setNames(seq_along(vars),vars)`
	`15`	`+`
	`16`	`+eval_call<-function() {`
	`17`	`+tidyselect::eval_select(`
	`18`	`+quo,`
	`19`	`+data=data_mask,`
	`20`	`+strict=strict,`
	`21`	`+allow_predicates=allow_predicates`
	`22`	`+ )`
	`23`	`+ }`
	`24`	`+`
	`25`	`+locations<-if (allow_predicates) {`
	`26`	`+ eval_call()`
	`27`	`+ }else {`
	`28`	`+ suppressWarnings(eval_call())`
	`29`	`+ }`
	`30`	`+`
	`31`	`+stats::setNames(vars[locations], names(locations))`
	`32`	`+}`

Comments

(0)