allow lambda notation for breaks/binwidth/bins

teunbrand · teunbrand · commit 653410fb6a40 · 2024-12-04T12:47:58.000+01:00
diff --git a/R/bin.R b/R/bin.R
@@ -124,6 +124,7 @@ compute_bins <- function(x, scale = NULL, breaks = NULL, binwidth = NULL, bins =
   check_length(range, 2L)
 
   if (!is.null(breaks)) {
+    breaks <- allow_lambda(breaks)
     if (is.function(breaks)) {
       breaks <- breaks(x)
     }
@@ -142,6 +143,7 @@ compute_bins <- function(x, scale = NULL, breaks = NULL, binwidth = NULL, bins =
   }
 
   if (!is.null(binwidth)) {
+    binwidth <- allow_lambda(binwidth)
     if (is.function(binwidth)) {
       binwidth <- binwidth(x)
     }
@@ -153,6 +155,7 @@ compute_bins <- function(x, scale = NULL, breaks = NULL, binwidth = NULL, bins =
     return(bins)
   }
 
+  bins <- allow_lambda(bins)
   if (is.function(bins)) {
     bins <- bins(x)
   }

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ compute_bins <- function(x, scale = NULL, breaks = NULL, binwidth = NULL, bins =`
`124`	`124`	`check_length(range, 2L)`
`125`	`125`
`126`	`126`	`if (!is.null(breaks)) {`
	`127`	`+ breaks <- allow_lambda(breaks)`
`127`	`128`	`if (is.function(breaks)) {`
`128`	`129`	`breaks <- breaks(x)`
`129`	`130`	`}`
`@@ -142,6 +143,7 @@ compute_bins <- function(x, scale = NULL, breaks = NULL, binwidth = NULL, bins =`
`142`	`143`	`}`
`143`	`144`
`144`	`145`	`if (!is.null(binwidth)) {`
	`146`	`+ binwidth <- allow_lambda(binwidth)`
`145`	`147`	`if (is.function(binwidth)) {`
`146`	`148`	`binwidth <- binwidth(x)`
`147`	`149`	`}`
`@@ -153,6 +155,7 @@ compute_bins <- function(x, scale = NULL, breaks = NULL, binwidth = NULL, bins =`
`153`	`155`	`return(bins)`
`154`	`156`	`}`
`155`	`157`
	`158`	`+ bins <- allow_lambda(bins)`
`156`	`159`	`if (is.function(bins)) {`
`157`	`160`	`bins <- bins(x)`
`158`	`161`	`}`