From bc8abae22eb08286def586e5ec77b8c249e26678 Mon Sep 17 00:00:00 2001 From: Lionel Henry Date: Wed, 12 May 2021 13:21:22 +0200 Subject: [PATCH] Update `named` default in exported dots collection routines Follow-up to #1200 Closes #1203 --- src/internal/dots.c | 11 +++++++---- src/internal/init.c | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/internal/dots.c b/src/internal/dots.c index 26751b0db3..edf60547cc 100644 --- a/src/internal/dots.c +++ b/src/internal/dots.c @@ -920,9 +920,11 @@ r_obj* ffi_dots_values(r_obj* args) { return out; } -r_obj* ffi_env_dots_values(r_obj* env) { + +// [[ export() ]] +r_obj* rlang_env_dots_values(r_obj* env) { return dots_values_impl(env, - r_false, + r_null, rlang_objs_trailing, r_false, r_true, @@ -930,9 +932,10 @@ r_obj* ffi_env_dots_values(r_obj* env) { r_false, false); } -r_obj* ffi_env_dots_list(r_obj* env) { +// [[ export() ]] +r_obj* rlang_env_dots_list(r_obj* env) { return dots_values_impl(env, - r_false, + r_null, rlang_objs_trailing, r_false, r_true, diff --git a/src/internal/init.c b/src/internal/init.c index 57b2f81798..54efb11f6b 100644 --- a/src/internal/init.c +++ b/src/internal/init.c @@ -253,8 +253,8 @@ void R_init_rlang(DllInfo* dll) { R_RegisterCCallable("rlang", "rlang_xxh3_64bits", (DL_FUNC) &XXH3_64bits); // Maturing - R_RegisterCCallable("rlang", "rlang_env_dots_list", (DL_FUNC) &ffi_env_dots_list); - R_RegisterCCallable("rlang", "rlang_env_dots_values", (DL_FUNC) &ffi_env_dots_values); + R_RegisterCCallable("rlang", "rlang_env_dots_list", (DL_FUNC) &rlang_env_dots_list); + R_RegisterCCallable("rlang", "rlang_env_dots_values", (DL_FUNC) &rlang_env_dots_values); R_RegisterCCallable("rlang", "rlang_is_splice_box", (DL_FUNC) &is_splice_box); R_RegisterCCallable("rlang", "rlang_obj_encode_utf8", (DL_FUNC) &obj_encode_utf8); R_RegisterCCallable("rlang", "rlang_str_as_symbol", (DL_FUNC) &r_str_as_symbol);