Merge branch 'NikNakk-master'

Author: hadley

NEWS

@@ -191,6 +191,10 @@ ggplot2 1.0.1.9xxx
 
 * `override.aes` now works with American aesthetic spelling, e.g. color
 
+* Fixed `strip_dots` to work with anonymous functions within calculated
+  aesthetics (e.g. `aes(sapply(..density.., function(x) mean(x))))`
+  (#1154, @NikNakk)
+
 ggplot2 1.0.1
 ----------------------------------------------------------------
 

R/aes-calculated.r

@@ -28,13 +28,18 @@ strip_dots <- function(expr) {
   if (is.atomic(expr)) {
     expr
   } else if (is.name(expr)) {
-    as.name(gsub(match_calculated_aes, "\\1", as.character(expr)))
+    expr_ch <- as.character(expr)
+    if (nchar(expr_ch) > 0) {
+      as.name(gsub(match_calculated_aes, "\\1", expr_ch))
+    } else {
+      expr
+    }
   } else if (is.call(expr)) {
     expr[-1] <- lapply(expr[-1], strip_dots)
     expr
   } else if (is.pairlist(expr)) {
     # In the unlikely event of an anonymous function
-    as.pairlist(lapply(expr, expr))
+    as.pairlist(lapply(expr, strip_dots))
   } else if (is.list(expr)) {
     # For list of aesthetics
     lapply(expr, strip_dots)

tests/testthat/test-layer.r

@@ -15,4 +15,6 @@ test_that("Calling using variable surround by .. is calculated", {
 test_that("strip_dots remove dots around calculated aesthetics", {
   expect_equal(strip_dots(aes(x=..density..))$x, quote(density))
   expect_equal(strip_dots(aes(mean(..density..)))$x, quote(mean(density)))
+  expect_equal(strip_dots(aes(sapply(..density.., function(x) mean(x)))$x),
+               quote(sapply(density, function(x) mean(x))))
 })