From 454bb4afa1960074b9c156862731d44c7afbe5e9 Mon Sep 17 00:00:00 2001
From: florent <florent@laas.fr>
Date: Sat, 20 Nov 2010 21:05:01 +0100
Subject: [PATCH] Re-inforce type checking.
* src/dynamic-graph-py.cc,
* src/dynamic_graph/__init__.py: plug now takes to signals as arguments
---
src/dynamic-graph-py.cc | 25 ++++++++++++++++++-------
src/dynamic_graph/__init__.py | 5 +----
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/dynamic-graph-py.cc b/src/dynamic-graph-py.cc
index 544b0b5..a6235bc 100644
--- a/src/dynamic-graph-py.cc
+++ b/src/dynamic-graph-py.cc
@@ -11,6 +11,7 @@
#include <dynamic-graph/exception-factory.h>
#include <dynamic-graph/interpreter-helper.h>
#include <dynamic-graph/functions.h>
+#include <dynamic-graph/signal-base.h>
namespace dynamicgraph {
namespace python {
@@ -44,21 +45,31 @@ namespace dynamicgraph {
PyObject*
plug(PyObject* self, PyObject* args)
{
- char* objIn = NULL;
- char* objOut = NULL;
- char* sigIn = NULL;
- char* sigOut = NULL;
- if (!PyArg_ParseTuple(args,"ssss", &objOut, &sigOut, &objIn, &sigIn))
+ PyObject* objOut = NULL;
+ PyObject* objIn = NULL;
+ void* pObjOut;
+ void* pObjIn;
+
+ if (!PyArg_ParseTuple(args,"OO", &objOut, &objIn))
+ return NULL;
+
+ if (!PyCObject_Check(objOut))
+ return NULL;
+ if (!PyCObject_Check(objIn))
return NULL;
+ pObjIn = PyCObject_AsVoidPtr(objIn);
+ SignalBase<int>* signalIn = (SignalBase<int>*)pObjIn;
+ pObjOut = PyCObject_AsVoidPtr(objOut);
+ SignalBase<int>* signalOut = (SignalBase<int>*)pObjOut;
std::ostringstream os;
+
try {
- interpreter.cmdPlug(objOut, sigOut, objIn, sigIn, os);
+ signalIn->plug(signalOut);
} catch (std::exception& exc) {
PyErr_SetString(error, exc.what());
return NULL;
}
-
return Py_BuildValue("");
}
diff --git a/src/dynamic_graph/__init__.py b/src/dynamic_graph/__init__.py
index 9ca6f39..6882617 100644
--- a/src/dynamic_graph/__init__.py
+++ b/src/dynamic_graph/__init__.py
@@ -10,9 +10,6 @@ import re
def plug (signalOut, signalIn) :
"""
Plug an output signal into an input signal
- syntax is plug ("entityIn.signalIn", "entityOut.signalOut")
"""
# get signals and entities
- [eOut, sOut] = re.split("\.", signalOut)
- [eIn, sIn] = re.split("\.", signalIn)
- w_plug(eOut, sOut, eIn, sIn)
+ w_plug(signalOut.object, signalIn.object)
--
GitLab