Changeset 36 for branches

Timestamp:

05/24/07 17:41:53 (2 years ago)

Author:

hines

Message:

handle equivalence between python None and hoc NULLobject
a hoc object can be any python object (in the hoc world it is type
PythonObject?) including numbers and strings. (But remember that if the
python object is of type HocObject, then in the hoc world it will be
a native hoc object such as Vector, List, etc. instead of PythonObject?)

Files:

• branches/py2nrn/src/nrnpython/nrnpy_hoc.cpp (modified) (4 diffs)
• branches/py2nrn/src/nrnpython/nrnpy_p2h.cpp (modified) (2 diffs)

branches/py2nrn/src/nrnpython/nrnpy_hoc.cpp

@@ -43 +43 @@
-extern Symbol* nrnpy_pyobj_sym_;
-extern PyObject* nrnpy_hoc2pyobject(Object*);
-
+
-/*
-Because python types have so many methods, attempt to do all set and get
@@ -267 +267 @@
-                ho = *d;
-//printf("Py2Nrn %lx %lx\n", (long)ho->ctemplate->sym, (long)nrnpy_pyobj_sym_);
-
+
+
+
-                        result = nrnpy_hoc2pyobject(ho);
-                }else{
@@ -539 +541 @@
-                        hoc_pc = pcsav;
-                        Object* ho = *hoc_objpop();
-
+
+
+
-                                result = nrnpy_hoc2pyobject(ho);
-                        }else{
@@ -658 +662 @@
-                Object** op;
-                op = hoc_objpop();
-
-
+
+
+
+
+
+
+
+
+
+
- PyErr_SetString(PyExc_TypeError, "argument cannot be a hoc object intermediate");
-
+
+
+
+
+
+
+
-                        }
-                        hoc_obj_ref(po->ho_);
-                        hoc_obj_unref(*op);
-                        *op = po->ho_;
-                }else{
-                        err = 1;

branches/py2nrn/src/nrnpython/nrnpy_p2h.cpp

@@ -12 +12 @@
-extern Object* hoc_new_object(Symbol*, void*);
-PyObject* nrnpy_hoc2pyobject(Object*);
-
+
-extern Symbol* nrnpy_pyobj_sym_;
-void (*nrnpy_py2n_component)(Object*, Symbol*, int, int);
@@ -59 +59 @@
-PyObject* nrnpy_hoc2pyobject(Object* ho) {
-        return ((Py2Nrn*)ho->u.this_pointer)->po_;
+}
+
+void nrnpy_pyobject_in_objptr(Object** ho, PyObject* po) {
+        Py2Nrn* pn = new Py2Nrn();
+        pn->po_ = po;
+        Py_INCREF(po);
+        pn->type_ = 1;
+        Object* on = hoc_new_object(nrnpy_pyobj_sym_, (void*)pn);
+        hoc_obj_ref(on);
+        hoc_obj_unref(*ho);
+        *ho = on;
-}
-