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

[tfry at users.sourceforge.net]

Revision: 1385
          http://svn.sourceforge.net/rkward/?rev=1385&view=rev
Author:   tfry
Date:     2007-02-12 09:16:33 -0800 (Mon, 12 Feb 2007)

Log Message:
-----------
Sometime R_Interactive appeared in R. We now set it explicitely.

Modified Paths:
--------------
    trunk/rkward/TODO
    trunk/rkward/rkward/rbackend/rembedinternal.cpp
    trunk/rkward/rkward/rkward.sh.template

Modified: trunk/rkward/TODO
===================================================================
--- trunk/rkward/TODO	2007-02-12 16:48:19 UTC (rev 1384)
+++ trunk/rkward/TODO	2007-02-12 17:16:33 UTC (rev 1385)
@@ -24,6 +24,7 @@
 		- converting objects to a different type is broken (works in the editor, but the type remains unchanged in the backend)
 			- maybe we could do the change in the backend, and then sync
 				- function rk.change.vector.mode() to change the mode, keeping attributed, and adding invalid values where needed
+				- sync using updateFromR(), updateDataFromR()
 
 Compilation / technical
 	- Incorporate FreeBSD patches http://www.freshports.org/math/rkward/files.php?message_id=200609172111.k8HLBiob081349@repoman.freebsd.org

Modified: trunk/rkward/rkward/rbackend/rembedinternal.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-02-12 16:48:19 UTC (rev 1384)
+++ trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-02-12 17:16:33 UTC (rev 1385)
@@ -81,6 +81,7 @@
 extern int Rf_initialize_R(int ac, char **av);
 extern void setup_Rmainloop(void); /* in main.c */
 extern unsigned long R_CStackLimit;
+extern Rboolean R_Interactive;
 #endif
 #ifndef USE_R_REPLDLLDO1
 extern Rboolean R_Visible;
@@ -522,6 +523,7 @@
 	R_CStackLimit = (unsigned long) -1;
 	setup_Rmainloop ();
 	RKGlobals::na_double = NA_REAL;
+	R_Interactive = (Rboolean) TRUE;
 	R_ReplDLLinit ();
 	return true;
 #else

Modified: trunk/rkward/rkward/rkward.sh.template
===================================================================
--- trunk/rkward/rkward/rkward.sh.template	2007-02-12 16:48:19 UTC (rev 1384)
+++ trunk/rkward/rkward/rkward.sh.template	2007-02-12 17:16:33 UTC (rev 1385)
@@ -2,6 +2,7 @@
 # Shell wrapper for rkward executable.
 
 ## make sure, we always run in a tty. Otherwise R would go into non-interactive mode and behaves strangely.
+## this can be removed later. For R versions 2.3.0 and greater, we set R_Interactive from C
 if tty -s; then
   :
 else


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