[rkward-cvs] SF.net SVN: rkward: [841] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 841
          http://svn.sourceforge.net/rkward/?rev=841&view=rev
Author:   tfry
Date:     2006-10-11 03:31:51 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
deparse function argument values in .rk.get.structure ()

Modified Paths:
--------------
    trunk/rkward/TODO
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R

Modified: trunk/rkward/TODO
===================================================================
--- trunk/rkward/TODO	2006-10-11 10:15:22 UTC (rev 840)
+++ trunk/rkward/TODO	2006-10-11 10:31:51 UTC (rev 841)
@@ -95,8 +95,6 @@
 				(object list remains the same, watch was not active, but symbol changed)
 				- will need to put an extra notification inside .rk.watch.globalenv ()? Will that get run?
 			- deal with data changes in edited objects
-	- RFunctionObject:
-		- problem with argument values like "" (or text arguments in general). Need to find a better representation. Maybe use formals () directly, and do all work in RFunctionObject::updateArguments ()
 	- RExpressionObject as an abstraction for R-Expressions (i.e. manually edited expressions).
 		- It will be possible to "store" these in the RObjectList and select them just like any other object
 		- RKVarslot will allow editing the selected value by hand (or just typing the name in)

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R	2006-10-11 10:15:22 UTC (rev 840)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R	2006-10-11 10:31:51 UTC (rev 841)
@@ -309,7 +309,7 @@
 		return (invisible (list (name, type, classes, meta, dims, sub)))
 	} else if (fun) {	# a function
 		argnames <- as.character (names (formals (x)))
-		argvalues <- as.character (formals (x))
+		argvalues <- as.character (lapply (formals (x), function (v) deparse (v)))
 		return (invisible (list (name, type, classes, meta, dims, argnames, argvalues)))
 	}
 	return (invisible (list (name, type, classes, meta, dims)))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.