From 5f602e3104fbb2ea0c7421af1bf07cd9592b8da3 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Wed, 23 Jul 2014 19:46:12 -0500
Subject: [PATCH] Updates to R8

---
 NAMESPACE    |  1 +
 R/r8_class.R | 49 ++++++++++++++-----------------------------------
 src/r8.c     | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 35 deletions(-)
 create mode 100644 src/r8.c

diff --git a/NAMESPACE b/NAMESPACE
index 13f8a25..cec4005 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -7,3 +7,4 @@ S3method(print,R6ClassGenerator)
 export(R6Class)
 export(R7Class)
 export(R8Class)
+useDynLib(R6,subset_R8)
diff --git a/R/r8_class.R b/R/r8_class.R
index 372a806..7ab944c 100644
--- a/R/r8_class.R
+++ b/R/r8_class.R
@@ -22,22 +22,13 @@ R8Class <- function(classname = NULL, public = list(),
     stop("All items in active must be functions.")
   }
 
-  # Separate methods from non-methods
+  # Separate methods from fields
   fun_idx <- vapply(public, is.function, logical(1))
-  public_methods <- public[fun_idx]
   public_fields <- public[!fun_idx]
+  public_methods <- new.env(parent = emptyenv(), hash = FALSE)
+  list2env2(public[fun_idx], envir = public_methods)
 
 
-  # # Enclosing env for methods
-  # public_methods <- assign_func_envs(public_methods, parent_env)
-  # # Binding env for methods
-  # public_methods_env <- new.env(parent = emptyenv(), hash = length(public_methods) > 100)
-  # # Turn methods into an environment so that it's possible to add methods later
-  # list2env2(public_methods, envir = public_methods_env)
-  # if (lock) {
-  #   lockEnvironment(public_methods_env)
-  # }
-
   # if (!is.null(inherit)) {
   #   if (!inherits(inherit, "R8ClassGenerator")) {
   #     stop("`inherit` must be a R8ClassGenerator.")
@@ -89,20 +80,16 @@ R8Class_newfun <- function(classes, public_fields, public_methods, private, acti
     # Add self pointer
     eval_env$self <- public_bind_env
 
-    # # Fix environment for functions
-    # public <- assign_func_envs(public, eval_env)
-
     # Copy objects to environments
     list2env2(public_fields, envir = public_bind_env)
 
-    # # Do same for private
-    # if (has_private) {
-    #   private_bind_env <- new.env(parent = emptyenv(),
-    #                               hash = (length(private) > 100))
-    #   eval_env$private <- private_bind_env
-    #   private <- assign_func_envs(private, eval_env)
-    #   list2env2(private, envir = private_bind_env)
-    # }
+    # Do same for private
+    if (has_private) {
+      private_bind_env <- new.env(parent = emptyenv(),
+                                  hash = (length(private) > 100))
+      eval_env$private <- private_bind_env
+      list2env2(private, envir = private_bind_env)
+    }
 
     # # Set up active bindings
     # if (!is.null(active)) {
@@ -177,19 +164,11 @@ create_r8_super_env <- function(super_list, public_bind_env, private_bind_env =
   super_bind_env
 }
 
-#' @export
-`$.R8` <- function(x, name) {
-  methods <- attr(x, "public_methods", exact = TRUE)
-  fun <- methods[[name]]
-
-  if (!is.null(fun)) {
-    eval_env <- attr(x, "eval_env", exact = TRUE)
-    environment(fun) <- eval_env
-    fun
 
-  } else {
-    .subset2(x, name)
-  }
+#' @export
+#' @useDynLib R6 subset_R8
+`$.R8` <-  function(x, name) {
+  .Call(subset_R8, x, name)
 }
 
 #' @export
diff --git a/src/r8.c b/src/r8.c
new file mode 100644
index 0000000..5095751
--- /dev/null
+++ b/src/r8.c
@@ -0,0 +1,32 @@
+#include <R.h>
+#include <Rdefines.h>
+
+SEXP subset_R8(SEXP x, SEXP name) {
+  // Look in x (an environment) for the object
+  SEXP nameSym = Rf_install(CHAR(STRING_ELT(name, 0)));
+  SEXP foundVar = Rf_findVarInFrame(x, nameSym);
+  if (foundVar != R_UnboundValue) {
+    return foundVar;
+  }
+
+  // if not found in x, look in methods
+  SEXP methods = Rf_getAttrib(x, Rf_install("public_methods"));
+  if (methods == R_NilValue) {
+    return R_NilValue;
+  }
+  SEXP fun = Rf_findVarInFrame(methods, nameSym);
+  if (fun == R_UnboundValue) {
+    return R_NilValue;
+  }
+
+  // Make a copy of the function, with a new environment
+  SEXP fun2 = PROTECT(duplicate(fun));
+  SEXP eval_env = Rf_getAttrib(x, Rf_install("eval_env"));
+  if (eval_env == R_NilValue) {
+    UNPROTECT(1);
+    return R_NilValue;
+  }
+  SET_CLOENV(fun2, eval_env);
+  UNPROTECT(1);
+  return fun2;
+}