Don't create a constructor called "function" (#280)

Fixes #249. Fixes #279.
RConsortium · Feb 19, 2023 · 249b884 · 249b884
1 parent 4d5380b
commit 249b884
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/R/base.R b/R/base.R
@@ -1,4 +1,4 @@
-new_base_class <- function(name) {
+new_base_class <- function(name, constructor_name = name) {
   force(name)
 
   constructor <- function(.data = class_missing) {
@@ -16,6 +16,7 @@ new_base_class <- function(name) {
 
   out <- list(
     class = name,
+    constructor_name = constructor_name,
     constructor = constructor,
     validator = validator
   )
@@ -143,7 +144,7 @@ class_expression <- new_base_class("expression")
 #' @rdname base_classes
 #' @format NULL
 #' @order 1
-class_function <- new_base_class("function")
+class_function <- new_base_class("function", "fun")
 
 #' @export
 #' @rdname base_classes

diff --git a/R/constructor.R b/R/constructor.R
@@ -22,7 +22,7 @@ new_constructor <- function(parent, properties) {
     parent_fun <- parent
     args <- missing_args(union(arg_info$parent, arg_info$self))
   } else if (is_base_class(parent)) {
-    parent_name <- parent$class
+    parent_name <- parent$constructor_name
     parent_fun <- parent$constructor
     args <- missing_args(union(arg_info$parent, arg_info$self))
   } else if (is_S3_class(parent)) {