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

[tfry at users.sourceforge.net]

Revision: 1170
          http://svn.sourceforge.net/rkward/?rev=1170&view=rev
Author:   tfry
Date:     2007-01-17 11:25:19 -0800 (Wed, 17 Jan 2007)

Log Message:
-----------
Minor corrections, important TODOs

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rbackend/rembedinternal.cpp

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2007-01-17 17:35:15 UTC (rev 1169)
+++ trunk/rkward/ChangeLog	2007-01-17 19:25:19 UTC (rev 1170)
@@ -1,4 +1,9 @@
-- fix compilation for the upcoming R 2.5.0		TODO: check again, later, or write to R-devel about R_ParseVector
+- fix compilation for the upcoming R 2.5.0		TODO: check again
+							TODO: update debian dependencies:
+							- the old depends + :
+							- if compiled with R < 2.4.0: dependes r-base-core < 2.4.0
+							- if compiled with R 2.4.0 or greater: dependes r-base-core >= 2.4.0
+							- if compiled with R 2.5.0 or greater: dependes r-base-core >= 2.5.0 (or pre-versions!)
 - show full error message for syntax errors (only if compiled with R 2.4.0 or newer)
 - more correct auto-printing of values for user commands (only if compiled with R 2.4.0 or newer)
 - more correct handling of user commands consisting of several statements (only if compiled with R 2.4.0 or newer)

Modified: trunk/rkward/rkward/rbackend/rembedinternal.cpp
===================================================================
--- trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-01-17 17:35:15 UTC (rev 1169)
+++ trunk/rkward/rkward/rbackend/rembedinternal.cpp	2007-01-17 19:25:19 UTC (rev 1170)
@@ -552,7 +552,7 @@
 
 	// TODO: Maybe we can use R_ParseGeneral instead. Then we could find the exact character, where parsing fails. Nope: not exported API
 #ifdef R_2_5
-	pr=R_ParseVector(cv, -1, &status, NILSXP);
+	pr=R_ParseVector(cv, -1, &status, R_NilValue);
 #else
 	pr=R_ParseVector(cv, -1, &status);
 #endif
@@ -664,6 +664,8 @@
 #endif
 
 void REmbedInternal::runCommandInternal (const char *command, RKWardRError *error, bool print_result) {
+	connectCallbacks ();		// sorry, but we will not play nicely with additional frontends trying to override our callbacks. (Unless they start their own R event loop, then they should be fine)
+
 	if (!print_result) {
 		runCommandInternalBase (command, error);
 	} else {		// run a user command


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