Update named default in exported dots collection routines

Follow-up to #1200 Closes #1203
r-lib · May 12, 2021 · bc8abae · bc8abae
1 parent 667a290
commit bc8abae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/internal/dots.c b/src/internal/dots.c
@@ -920,19 +920,22 @@ 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,
                           rlang_objs_keep,
                           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
@@ -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);