colwise functions support constants in formulas;

closes #4374.
tidyverse · May 20, 2019 · de70321 · de70321
1 parent 1ab6d81
commit de70321
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,8 @@
 
 * `rename_at()` handles empty selection (#4324). 
 
+* colwise functions support constants in formulas (#4374). 
+
 # dplyr 0.8.1
 
 ## Breaking changes

diff --git a/inst/include/dplyr/hybrid/Expression.h b/inst/include/dplyr/hybrid/Expression.h
@@ -139,6 +139,9 @@ class Expression {
     if (TYPEOF(head) == CLOSXP && Rf_inherits(head, "inline_colwise_function")) {
       dot_alias = CADR(expr);
       expr = CADR(Rf_getAttrib(head, symbols::formula));
+      if (TYPEOF(expr) != LANGSXP) {
+        return;
+      }
       head = CAR(expr);
     }
 

diff --git a/tests/testthat/test-colwise-mutate.R b/tests/testthat/test-colwise-mutate.R
@@ -405,3 +405,15 @@ test_that("summarise_at() can refer to local variables and columns (#4304)", {
   })
 
 })
+
+test_that("colwise mutate handles formulas with constants (#4374)", {
+  expect_identical(
+    tibble(x = 12) %>% mutate_all(~ 42),
+    tibble(x = 42)
+  )
+  expect_identical(
+    tibble(x = 12) %>% mutate_at("x", ~ 42),
+    tibble(x = 42)
+  )
+})
+