Revision: 552
http://rpy.svn.sourceforge.net/rpy/?rev=552&view=rev
Author: lgautier
Date: 2008-06-07 14:26:40 -0700 (Sat, 07 Jun 2008)
Log Message:
-----------
Fix building of exceptions
Modified Paths:
--------------
branches/rpy_nextgen/rpy/rinterface/rinterface.c
Modified: branches/rpy_nextgen/rpy/rinterface/rinterface.c
===================================================================
--- branches/rpy_nextgen/rpy/rinterface/rinterface.c 2008-06-07 08:21:19 UTC
(rev 551)
+++ branches/rpy_nextgen/rpy/rinterface/rinterface.c 2008-06-07 21:26:40 UTC
(rev 552)
@@ -311,8 +311,13 @@
static void
EmbeddedR_exception_from_errmessage(void)
{
- char *message = CHARACTER_VALUE(eval(GetErrMessage_SEXP,
- R_GlobalEnv));
+ SEXP expr, res;
+ //PROTECT(GetErrMessage_SEXP);
+ PROTECT(expr = allocVector(LANGSXP, 1));
+ SETCAR(expr, GetErrMessage_SEXP);
+ PROTECT(res = Rf_eval(expr, R_GlobalEnv));
+ char *message = CHARACTER_VALUE(res);
+ UNPROTECT(2);
PyErr_SetString(RPyExc_RuntimeError, message);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
rpy-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rpy-list
