fix and test for #322

Author: Jordan S Read

R/function_args.R

@@ -10,18 +10,12 @@
 #' @param drop boolean for dropping all non-formal args passed in with \dots
 #' 
 #' @keywords internal
-function_args <- function(package, name, object, ..., use.default=paste0(name,'.default'), drop=FALSE){
+function_args <- function(package, name, object=c(), ..., use.default=paste0(name,'.default'), drop=FALSE){
   params <- list(...)
 
   if (!missing(object)) {
-    if (!is.null(names(object)))
-      params <- append(object, params)
-    else {
-      params <- append(list(object), params)
-    }
-  } else {
-    object = c() # replace w/ empty
-  }
+    params <- append_params(object, params)
+  } 
 
   if (length(params) == 0)
     return(list())
@@ -65,4 +59,20 @@ function_args <- function(package, name, object, ..., use.default=paste0(name,'.
   return(params)
 }
 
+append_params <- function(object, params){
+  UseMethod('append_params')
+}
+
+append_params.NULL <- function(object, params){
+  params
+}
+
+append_params.list <- function(object, params){
+  append(object, params)
+}
+
+append_params.default <- function(object, params){
+  append(list(object), params)
+}
+
 user_function_args <- function_args

man/function_args.Rd

@@ -10,7 +10,10 @@ test_that("graphics examples work", {
   lx <- seq(1, 5, length = 41)
   xy = xy.coords(x=10^lx,y=exp(-.5*lx^2))
   plot.xy(xy, type='p')
-
+  
+  plot(1,3)
+  points(data.frame(1,2), col='red')
+  
 })
 
 context("points arguments")