Merge remote-tracking branch 'upstream/main' into add-numeric-checks

Author: khusmann

DESCRIPTION

@@ -46,7 +46,7 @@ Suggests:
 Enhances:
     winch
 Encoding: UTF-8
-RoxygenNote: 7.3.2
+RoxygenNote: 7.3.3
 Roxygen: list(markdown = TRUE)
 URL: https://rlang.r-lib.org, https://github.com/r-lib/rlang
 BugReports: https://github.com/r-lib/rlang/issues

NAMESPACE

@@ -97,6 +97,7 @@ S3method(summary,rlang_trace)
 S3method(summary,rlang_warning)
 export("!!!")
 export("!!")
+export("%&&%")
 export("%<~%")
 export("%@%")
 export("%@%<-")

NEWS.md

@@ -1,7 +1,11 @@
 # rlang (development version)
 
+* New `%&&%` operator that returns RHS when LHS is non-NULL (#1774, @snystrom).
+
 * C code no longer calls `memcpy()` and `memset()` on 0-length R object memory
   (#1797).
+* `is_syntactic_literal()` returns `FALSE` for objects with attributes, such as `array(1)` or `factor("x")` (#1817, @jonthegeek).
+* `is_syntactic_literal()` returns `FALSE` for negative numbers and complex numbers with negative imaginary components (#1799, @jonthegeek).
 
 
 # rlang 1.1.6

R/expr.R

@@ -119,29 +119,26 @@ is_expression <- function(x) {
 #' @export
 #' @rdname is_expression
 is_syntactic_literal <- function(x) {
+  # Don't combine the tests, because we want to make sure type is one of these
+  # *before* dispatching on `length()` or `is.na()` or even `attributes()`.
   switch(
     typeof(x),
-    NULL = {
-      TRUE
-    },
-
+    NULL = TRUE,
     logical = ,
-    integer = ,
-    double = ,
     character = {
-      length(x) == 1
+      length(x) == 1 && is.null(attributes(x))
+    },
+    integer = ,
+    double = {
+      length(x) == 1 && is.null(attributes(x)) && (is.na(x) || x >= 0)
     },
-
     complex = {
-      if (length(x) != 1) {
-        return(FALSE)
-      }
-      is_na(x) || Re(x) == 0
+      length(x) == 1 && is.null(attributes(x)) && (is.na(x) || (Re(x) == 0 && Im(x) >= 0))
     },
-
     FALSE
   )
 }
+
 #' @export
 #' @rdname is_expression
 is_symbolic <- function(x) {

R/formula.R

@@ -101,8 +101,8 @@ is_bare_formula <- function(x, scoped = TRUE, lhs = NULL) {
 #' Get or set formula components
 #'
 #' `f_rhs` extracts the right-hand side, `f_lhs` extracts the left-hand
-#' side, and `f_env` extracts the environment. All functions throw an
-#' error if `f` is not a formula.
+#' side, and `f_env` extracts the environment in which the formula was defined.
+#' All functions throw an error if `f` is not a formula.
 #'
 #' @param f,x A formula
 #' @param value The value to replace with.
@@ -120,6 +120,8 @@ is_bare_formula <- function(x, scoped = TRUE, lhs = NULL) {
 #' f_lhs(x ~ y)
 #'
 #' f_env(~ x)
+#' f <- as.formula("y ~ x", env = new.env())
+#' f_env(f)
 f_rhs <- function(f) {
   if (is_quosure(f)) {
     signal_formula_access()

R/operators.R

@@ -19,6 +19,22 @@ if (exists("%||%", envir = baseenv())) {
   `%||%` <- get("%||%", envir = baseenv())
 }
 
+#' Default value for non-`NULL`
+#'
+#' This infix operator is the conceptual opposite of `%||%`, providing a fallback
+#' only if `x` is defined.
+#'
+#' @param x,y If `x` is NULL, will return `x`; otherwise returns `y`.
+#' @export
+#' @name op-null-continuation
+#' @seealso [op-null-default]
+#' @examples
+#' 1 %&&% 2
+#' NULL %&&% 2
+`%&&%` <- function(x, y) {
+  if (!is_null(x)) y else x
+}
+
 `%|0|%` <- function(x, y) {
   if (!length(x)) y else x
 }

R/standalone-types-check.R

@@ -13,6 +13,7 @@
 # - Rename `check_number_decimal()` to `check_number()` (@khusmann, #1714)
 # - Add `check_numeric()` and `check_numeric_whole()`, vectorized versions
 #   of `check_number()` and `check_number_whole()` (@khusmann, #1714)
+# - `check_logical()` gains an `allow_na` argument (@jonthegeek, #1724)
 #
 # 2024-08-15:
 # - `check_character()` gains an `allow_na` argument (@martaalcalde, #1724)
@@ -615,12 +616,20 @@ check_character <- function(
 check_logical <- function(
   x,
   ...,
+  allow_na = TRUE,
   allow_null = FALSE,
   arg = caller_arg(x),
   call = caller_env()
 ) {
   if (!missing(x)) {
     if (is_logical(x)) {
+      if (!allow_na && any(is.na(x))) {
+        abort(
+          sprintf("`%s` can't contain NA values.", arg),
+          arg = arg,
+          call = call
+        )
+      }
       return(invisible(NULL))
     }
     if (allow_null && is_null(x)) {

_pkgdown.yml

@@ -336,5 +336,6 @@ reference:
   - subtitle: Operators
     contents:
       - "`%||%`"
+      - "`%&&%`"
       - "`%|%`"
       - "`%@%`"