extracted class unions

IRkernel · Aug 3, 2016 · 674bc1a · 674bc1a
1 parent f0d3c26
commit 674bc1a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -28,6 +28,7 @@ Imports:
     digest
 Remotes: IRKernel/IRdisplay,
 Collate:
+    'class_unions.r'
     'logging.r'
     'comm_manager.r'
     'environment.r'

diff --git a/IRkernel.Rproj b/IRkernel.Rproj
@@ -17,5 +17,4 @@ AutoAppendNewline: Yes
 BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
-PackageCheckArgs: --as-cran
 PackageRoxygenize: rd,collate,namespace
diff --git a/R/class_unions.r b/R/class_unions.r
@@ -0,0 +1,3 @@
+setClassUnion('functionOrNULL', members = c('function', 'NULL'))
+setClassUnion('recordedplotOrNULL', members = c('recordedplot', 'NULL'))
+setClassUnion('listOrNULL', members = c('list', 'NULL'))
diff --git a/R/comm_manager.r b/R/comm_manager.r
@@ -1,8 +1,6 @@
-#' @include logging.r
+#' @include logging.r class_unions.r
 NULL
 
-setClassUnion('functionOrNULL', members = c('function', 'NULL'))
-
 #' The Comm_Manager
 #'
 #' Has methods able to register comms/targets and process comm messages
@@ -228,4 +226,4 @@ Comm <- setRefClass(
             }
         }
     )
-)
+)
diff --git a/R/execution.r b/R/execution.r
@@ -1,10 +1,6 @@
-#' @include options.r
+#' @include options.r class_unions.r
 NULL
 
-setClassUnion('recordedplotOrNULL', members = c('recordedplot', 'NULL'))
-
-setClassUnion('listOrNULL', members = c('list', 'NULL'))
-
 # Create an empty named list
 #' @importFrom stats setNames
 namedlist <- function() setNames(list(), character(0))