Use S7::method() for class_mapping getters/setters

Author: teunbrand

DESCRIPTION

@@ -93,10 +93,10 @@ Collate:
     'aes-group-order.R'
     'aes-linetype-size-shape.R'
     'aes-position.R'
+    'all-classes.R'
     'compat-plyr.R'
     'utilities.R'
     'aes.R'
-    'all-classes.R'
     'annotation-borders.R'
     'utilities-checks.R'
     'legend-draw.R'

NAMESPACE

@@ -3,13 +3,9 @@
 S3method("$","ggplot2::theme")
 S3method("$",ggproto)
 S3method("$",ggproto_parent)
-S3method("$<-","ggplot2::mapping")
-S3method("[","ggplot2::mapping")
 S3method("[",mapped_discrete)
-S3method("[<-","ggplot2::mapping")
 S3method("[<-",mapped_discrete)
 S3method("[[",ggproto)
-S3method("[[<-","ggplot2::mapping")
 S3method(.DollarNames,ggproto)
 S3method(as.data.frame,mapped_discrete)
 S3method(as.list,ggproto)

R/aes.R

@@ -1,4 +1,4 @@
-#' @include utilities.R compat-plyr.R
+#' @include utilities.R compat-plyr.R all-classes.R
 NULL
 
 #' Construct aesthetic mappings
@@ -147,25 +147,19 @@ new_aesthetic <- function(x, env = globalenv()) {
   invisible(x)
 }
 
-# TODO: should convert to proper S7 method once bug in S7 is resolved
-#' @export
-"[.ggplot2::mapping" <- function(x, i, ...) {
-  class_mapping(NextMethod())
-}
 
-# If necessary coerce replacements to quosures for compatibility
-#' @export
-"[[<-.ggplot2::mapping" <- function(x, i, value) {
-  class_mapping(NextMethod())
-}
-#' @export
-"$<-.ggplot2::mapping" <- function(x, i, value) {
-  class_mapping(NextMethod())
-}
-#' @export
-"[<-.ggplot2::mapping" <- function(x, i, value) {
-  class_mapping(NextMethod())
-}
+local({
+  S7::method(`[`, class_mapping) <- function(x, i, ...) {
+    class_mapping(`[`(S7::S7_data(x), i, ...))
+  }
+  S7::method(`$<-`, class_mapping) <- S7::method(`[[<-`, class_mapping) <-
+    function(x, i, value) {
+      class_mapping(`[[<-`(S7::S7_data(x), i, value))
+    }
+  S7::method(`[<-`, class_mapping) <- function(x, i, value) {
+    class_mapping(`[<-`(S7::S7_data(x), i, value))
+  }
+})
 
 #' Standardise aesthetic names
 #'