Merge pull request #231 from lionel-/release-0.1.2

Release 0.1.2

Author: lionel-

.Rbuildignore

@@ -8,3 +8,4 @@
 ^codecov\.yml$
 ^_pkgdown\.yml$
 ^docs$
+^appveyor\.yml$

.travis.yml

@@ -3,10 +3,14 @@
 language: r
 sudo: false
 cache: packages
-r:
-  - oldrel
-  - release
-  - devel
+
+matrix:
+  include:
+    - r: 3.1
+      warnings_are_errors: false
+    - r: oldrel
+    - r: release
+    - r: devel
 
 after_success:
   - Rscript -e 'covr::codecov(line_exclusions = c("R/lazy.R", "R/lazy-as.R", "R/lazy-dots.R", "R/lazy-names.R", "R/lazy-call.R", "R/lazy-eval.R", "R/lazy-interp.R", "src/lazy.c"))'

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: rlang
-Version: 0.1.1
+Version: 0.1.2
 Title: Functions for Base Types and Core R and 'Tidyverse' Features
 Description: A toolbox for working with base types, core R features
   like the condition system, and core 'Tidyverse' features like tidy

NEWS.md

@@ -1,4 +1,9 @@
 
+# rlang 0.1.2
+
+This hotfix release makes rlang compatible with the R 3.1 branch.
+
+
 # rlang 0.1.1
 
 This release includes two important fixes for tidy evaluation:

R/compat-oldrel.R

@@ -1,57 +1,39 @@
-# nocov start - compat-oldrel (last updated: rlang 0.1.9000)
+# nocov start - compat-oldrel (last updated: rlang 0.1.2)
 
 # This file serves as a reference for compatibility functions for old
-# versions of R.
-
-
-# Compat function for capture functions (that will hopefully make
-# their way to the next R version) -----------------------------------
-
-if (TRUE || utils::packageVersion("base") < "3.4.0") {
-
-  captureArg <- function(x, strict = TRUE) {
-    caller_env <- parent.frame()
-
-    if (identical(caller_env, globalenv())) {
-      stop("must be called in a function")
-    }
-    if (missing(x)) {
-      stop("argument \"x\" is missing")
-    }
-
-    .Call(rlang_capturearg, NULL, NULL, pairlist(caller_env, strict), get_env())
-  }
-
-  captureDots <- function(strict = TRUE) {
-    caller_env <- parent.frame()
-
-    if (!exists("...", caller_env)) {
-      stop("must be called in a function where dots exist")
-    }
-
-    .Call(rlang_capturedots, NULL, NULL, pairlist(caller_env, strict), get_env())
-  }
-
-}
+# versions of R. Please find the most recent version in rlang's
+# repository.
 
 
 # R 3.2.0 ------------------------------------------------------------
 
-if (utils::packageVersion("base") < "3.2.0") {
+if (getRversion() < "3.2.0") {
 
   dir_exists <- function(path) {
     !identical(path, "") && file.exists(paste0(path, .Platform$file.sep))
   }
   dir.exists <- function(paths) {
-    map_lgl(paths, dir_exists)
+    vapply(paths, dir_exists, logical(1))
   }
 
   names <- function(x) {
     if (is.environment(x)) {
-      ls(x, all.names = TRUE)
+      return(ls(x, all.names = TRUE))
     } else {
-      base::names(x)
+      return(base::names(x))
     }
+
+    # So R CMD check on old versions of R sees a generic, since we
+    # declare a names() method for dictionary objects
+    UseMethod("names")
+  }
+
+  trimws <- function(x, which = c("both", "left", "right")) {
+    switch(match.arg(which),
+      left = sub("^[ \t\r\n]+", "", x, perl = TRUE),
+      right = sub("[ \t\r\n]+$", "", x, perl = TRUE),
+      both = trimws(trimws(x, "left"), "right")
+    )
   }
 
 }

R/env.R

@@ -425,15 +425,11 @@ set_env <- function(env, new_env = caller_env()) {
   )
 }
 
-mut_parent_env <- function(env, new_env) {
-  env_ <- get_env(env)
-  parent.env(env_) <- get_env(new_env)
-  env
+mut_env_parent <- function(env, new_env) {
+  .Call(rlang_mut_env_parent, get_env(env), new_env)
 }
 `env_parent<-` <- function(x, value) {
-  env_ <- get_env(x)
-  parent.env(env_) <- get_env(value)
-  x
+  .Call(rlang_mut_env_parent, get_env(x), value)
 }
 
 

R/eval-tidy.R

@@ -295,7 +295,7 @@ overscope_eval_next <- function(overscope, quo, env = base_env()) {
   lexical_env <- f_env(quo)
 
   overscope$.env <- lexical_env
-  mut_parent_env(overscope$.top_env, lexical_env)
+  mut_env_parent(overscope$.top_env, lexical_env)
 
   .Call(rlang_eval, f_rhs(quo), overscope)
 }
@@ -328,13 +328,10 @@ f_self_eval <- function(overscope, overscope_top) {
       return(missing_arg())
     }
 
-    # Swap enclosures temporarily by rechaining the top of the
-    # dynamic scope to the enclosure of the new formula, if it has
-    # one. We do it at C level to avoid GC adjustments when changing
-    # the parent. This should be safe since we reset everything
-    # afterwards.
-    .Call(rlang_set_parent, overscope_top, f_env(f) %||% overscope$.env)
-    on.exit(.Call(rlang_set_parent, overscope_top, overscope$.env))
+    # Swap enclosures temporarily by rechaining the top of the dynamic
+    # scope to the enclosure of the new formula, if it has one
+    mut_env_parent(overscope_top, f_env(f) %||% overscope$.env)
+    on.exit(mut_env_parent(overscope_top, overscope$.env))
 
     .Call(rlang_eval, f_rhs(f), overscope)
   }

R/types.R

@@ -664,11 +664,6 @@ lang_type_of <- function(x) {
 #'
 #' structure(base::list, foo = "bar")
 #' str(base::list)
-#'
-#' # In expressions, calls and pairlists are safely copyable. However,
-#' # symbols are not:
-#' structure(quote(foo), foo = "bar")
-#' quote(foo)
 is_copyable <- function(x) {
   switch_type(x,
     NULL = ,

R/utils.R

@@ -75,3 +75,25 @@ discard_unnamed <- function(x) {
 sxp_address <- function(x) {
   .Call(rlang_sxp_address, x)
 }
+
+captureArg <- function(x, strict = TRUE) {
+  caller_env <- parent.frame()
+
+  if (identical(caller_env, globalenv())) {
+    stop("must be called in a function")
+  }
+  if (missing(x)) {
+    stop("argument \"x\" is missing")
+  }
+
+  .Call(rlang_capturearg, NULL, NULL, pairlist(caller_env, strict), get_env())
+}
+captureDots <- function(strict = TRUE) {
+  caller_env <- parent.frame()
+
+  if (!exists("...", caller_env)) {
+    stop("must be called in a function where dots exist")
+  }
+
+  .Call(rlang_capturedots, NULL, NULL, pairlist(caller_env, strict), get_env())
+}

cran-comments.md

@@ -1,16 +1,8 @@
-## Bugfix release
-
-The last rlang release was sent recently, but we have discovered one
-issue with the bytecode compiler that causes downstream failures in
-the reverse dependencies of the next dplyr version. This release
-should prevent many R CMD check failures for compiled packages
-depending on dplyr.
-
 
 ## Test environments
 
-* local OS X install, R 3.4.0
-* ubuntu 12.04 (on travis-ci), R 3.4.0
+* local OS X install, R 3.4.1
+* ubuntu 12.04 (on travis-ci), R 3.4.1
 * win-builder (devel and release)
 
 
@@ -21,7 +13,7 @@ depending on dplyr.
 
 ## Reverse dependencies
 
-I have run R CMD check on the 2 downstream dependencies. (Summary at
-https://github.com/tidyverse/rlang/tree/master/revdep).
+I have run R CMD check on the 37 downstream dependencies. (Summary at
+https://github.com/tidyverse/rlang/tree/v0.1.2/revdep).
 
 There were no problems.