[rkward-cvs] rkward/rkward/rbackend/rpackages/rkward/R public.R, 1.15, 1.16

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/rbackend/rpackages/rkward/R
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv31789/R

Modified Files:
	public.R 
Log Message:
Make rk.get.description work with substitutes

Index: public.R
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rbackend/rpackages/rkward/R/public.R,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** public.R	14 Apr 2006 22:51:50 -0000	1.15
--- public.R	16 Aug 2006 16:49:55 -0000	1.16
***************
*** 29,40 ****
  
  # get descriptive strings for each of the arguments in ...
! "rk.get.description" <- function (..., paste.sep=NULL) {
  	args <- list(...)
! 	argnames <- rk.list.names (...)
  	descript <- c ()
  
  	for (i in 1:length (args)) {
  		lbl <- rk.get.label (args[[i]])
! 		shortname <- .rk.make.short.name (argnames[i])
  
  		if (is.null (lbl)) descript[i] <- shortname
--- 29,53 ----
  
  # get descriptive strings for each of the arguments in ...
! "rk.get.description" <- function (..., paste.sep=NULL, is.substitute=FALSE) {
  	args <- list(...)
! 	if (is.substitute) {
! 		argnames <- list ()
! 		j <- 1
! 		for (symb in list (...)) {
! 			argnames[j] <- deparse (symb)
! 			j <- j + 1
! 		}
! 	} else {
! 		argnames <- rk.list.names (...)
! 	}
  	descript <- c ()
  
  	for (i in 1:length (args)) {
  		lbl <- rk.get.label (args[[i]])
! 		if (is.substitute) {
! 			shortname <- .rk.make.short.name (as.character (argnames[i]))
! 		} else {
! 			shortname <- .rk.make.short.name (argnames[i])
! 		}
  
  		if (is.null (lbl)) descript[i] <- shortname