Revision: 546
http://rpy.svn.sourceforge.net/rpy/?rev=546&view=rev
Author: lgautier
Date: 2008-06-05 11:07:04 -0700 (Thu, 05 Jun 2008)
Log Message:
-----------
Fixes for the previous fix (parenthesis and other like typographic
differences with visible consequences)
Modified Paths:
--------------
branches/rpy_nextgen/rpy/rinterface/rinterface.c
branches/rpy_nextgen/rpy/rinterface/rinterface.h
Modified: branches/rpy_nextgen/rpy/rinterface/rinterface.c
===================================================================
--- branches/rpy_nextgen/rpy/rinterface/rinterface.c 2008-06-04 18:31:44 UTC
(rev 545)
+++ branches/rpy_nextgen/rpy/rinterface/rinterface.c 2008-06-05 18:07:04 UTC
(rev 546)
@@ -434,7 +434,7 @@
Sexp_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
static int
-Sexp_init(PySexpObject *self, PyObject *args, PyObject *kwds);
+Sexp_init(PyObject *self, PyObject *args, PyObject *kwds);
/*
* Generic Sexp_Type. It represents SEXP objects at large.
@@ -573,8 +573,8 @@
//oldSexp = RPY_SEXP((PySexpObject *)sourceObject);
//RPY_SEXP(self) = oldSexp;
free(((PySexpObject *)self)->sObj);
- self->sObj = ((PySexpObject *)sourceObject)->sObj;
- RPY_INCREF(self);
+ ((PySexpObject *)self)->sObj = ((PySexpObject *)sourceObject)->sObj;
+ RPY_INCREF((PySexpObject *)self);
#ifdef RPY_VERBOSE
printf("%p: sexp count is increased to %i.\n",
(PySexpObject *)self, RPY_COUNT((PySexpObject *)self));
@@ -1904,7 +1904,7 @@
);
PYASSERT_ZERO(
PyList_SetItem(initOptions, 1,
- PyString_FromString("--quiet"))
+ PyString_FromString("--verbose"))
);
PYASSERT_ZERO(
PyList_SetItem(initOptions, 2,
@@ -1915,9 +1915,9 @@
PyString_FromString("--no-save"))
);
PyModule_AddObject(m, "initOptions", initOptions);
+ //
PyString_FromString("--quiet"))
-
PyModule_AddObject(m, "Sexp", (PyObject *)&Sexp_Type);
PyModule_AddObject(m, "SexpClosure", (PyObject *)&ClosureSexp_Type);
PyModule_AddObject(m, "SexpVector", (PyObject *)&VectorSexp_Type);
Modified: branches/rpy_nextgen/rpy/rinterface/rinterface.h
===================================================================
--- branches/rpy_nextgen/rpy/rinterface/rinterface.h 2008-06-04 18:31:44 UTC
(rev 545)
+++ branches/rpy_nextgen/rpy/rinterface/rinterface.h 2008-06-05 18:07:04 UTC
(rev 546)
@@ -30,8 +30,8 @@
//#define RPY_SEXP(obj) ((obj)->sexp)
//#define RPY_RPYONLY(obj) (((obj)->sObj)->rpy_only)
-#define RPY_INCREF(obj) ((obj->sObj)->count++)
-#define RPY_DECREF(obj) ((obj->sObj)->count--)
+#define RPY_INCREF(obj) (((obj)->sObj)->count++)
+#define RPY_DECREF(obj) (((obj)->sObj)->count--)
#endif /* !RPY_RI_H */
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
rpy-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/rpy-list
