Merge pull request #463 from RConsortium/revert-implicit-s3-array

revert `class_array` and `class_matrix`

NAMESPACE

@@ -49,7 +49,6 @@ export(class_POSIXct)
 export(class_POSIXlt)
 export(class_POSIXt)
 export(class_any)
-export(class_array)
 export(class_atomic)
 export(class_call)
 export(class_character)
@@ -65,7 +64,6 @@ export(class_integer)
 export(class_language)
 export(class_list)
 export(class_logical)
-export(class_matrix)
 export(class_missing)
 export(class_name)
 export(class_numeric)

R/S3.R

@@ -252,8 +252,8 @@ validate_formula <- function(self) {
 #' * `class_Date` for dates.
 #' * `class_factor` for factors.
 #' * `class_POSIXct`, `class_POSIXlt` and `class_POSIXt` for date-times.
-#' * `class_matrix` for matrices.
-#' * `class_array` for arrays.
+# * `class_matrix` for matrices.
+# * `class_array` for arrays.
 #' * `class_formula` for formulas.
 
 #'
@@ -325,10 +325,10 @@ class_data.frame <- new_S3_class("data.frame",
   validator = validate_data.frame
 )
 
-#' @export
-#' @rdname base_s3_classes
-#' @format NULL
-#' @order 3
+#  @export
+#  @rdname base_s3_classes
+#  @format NULL
+#  @order 3
 class_matrix <- new_S3_class("matrix",
   constructor = function(.data = logical(), nrow = NULL, ncol = NULL, byrow = FALSE, dimnames = NULL) {
     nrow <- nrow %||% NROW(.data)
@@ -343,10 +343,10 @@ class_matrix <- new_S3_class("matrix",
   validator = validate_matrix
 )
 
-#' @export
-#' @rdname base_s3_classes
-#' @format NULL
-#' @order 3
+#  @export
+#  @rdname base_s3_classes
+#  @format NULL
+#  @order 3
 class_array <- new_S3_class("array",
   constructor = function(.data = logical(),
                          dim = base::dim(.data) %||% length(.data),

R/S4.R

@@ -85,8 +85,8 @@ S4_basic_classes <- function() {
     POSIXct = class_POSIXct,
     POSIXlt = class_POSIXlt,
     POSIXt = class_POSIXt,
-    matrix = class_matrix,
-    array = class_array,
+    # matrix = class_matrix,
+    # array = class_array,
     formula = class_formula
   )
 }

tests/testthat/test-base.R

@@ -250,25 +250,25 @@ test_that("Base S3 classes can be parents", {
   expect_error(Foo(list(x = 1:3, y = 1:4)),
                "all variables should have the same length")
 
-  expect_no_error({
-    Foo := new_class(class_matrix)
-    Foo(1:4, nrow = 2)
-    Foo(NA)
-    Foo(matrix(1:4, nrow = 2))
-  })
-
-  expect_no_error({
-    Foo := new_class(class_array)
-
-    Foo(array(1:4, dim = c(2, 2)))
-    Foo(1:4, dim = c(2, 2))
-
-    Foo(array(1:24, dim = c(2, 3, 4)))
-    Foo(1:24, dim = c(2, 3, 4))
-
-    Foo(array(1))
-    Foo(1)
-  })
+  # expect_no_error({
+  #   Foo := new_class(class_matrix)
+  #   Foo(1:4, nrow = 2)
+  #   Foo(NA)
+  #   Foo(matrix(1:4, nrow = 2))
+  # })
+
+  # expect_no_error({
+  #   Foo := new_class(class_array)
+  #
+  #   Foo(array(1:4, dim = c(2, 2)))
+  #   Foo(1:4, dim = c(2, 2))
+  #
+  #   Foo(array(1:24, dim = c(2, 3, 4)))
+  #   Foo(1:24, dim = c(2, 3, 4))
+  #
+  #   Foo(array(1))
+  #   Foo(1)
+  # })
 
   expect_no_error({
     Foo := new_class(class_formula)
@@ -294,17 +294,17 @@ test_that("Base S3 classes can be properties", {
   })
   expect_error(Foo(x = 1), "@x must be S3<data.frame>, not <double>")
 
-  expect_no_error({
-    Foo := new_class(properties = list(x = class_matrix))
-    Foo(x = matrix())
-  })
-  expect_error(Foo(x = 1), "@x must be S3<matrix>, not <double>")
-
-  expect_no_error({
-    Foo := new_class(properties = list(x = class_array))
-    Foo(x = array())
-  })
-  expect_error(Foo(x = 1), "@x must be S3<array>, not <double>")
+  # expect_no_error({
+  #   Foo := new_class(properties = list(x = class_matrix))
+  #   Foo(x = matrix())
+  # })
+  # expect_error(Foo(x = 1), "@x must be S3<matrix>, not <double>")
+
+  # expect_no_error({
+  #   Foo := new_class(properties = list(x = class_array))
+  #   Foo(x = array())
+  # })
+  # expect_error(Foo(x = 1), "@x must be S3<array>, not <double>")
 
   expect_no_error({
     Foo := new_class(properties = list(x = class_formula))