Changeset 13

Timestamp:

04/24/07 16:26:31 (2 years ago)

Author:

hines

Message:

using the hoc stack machine quite a bit so factor out the common save/restore

Files:

• branches/pygetsetcall/src/nrnpython/nrnpy_hoc.cpp (modified) (8 diffs)

branches/pygetsetcall/src/nrnpython/nrnpy_hoc.cpp

@@ -126 +126 @@
-}
-
+static Inst* save_pc(Inst* newpc) {
+        Inst* savpc = hoc_pc;
+        hoc_pc = newpc;
+        return savpc;
+}
+
-static int hocobj_pushargs(PyObject* args) {
-        int i, narg = PyTuple_Size(args);
@@ -168 +174 @@
-static void component(PyHocObject* po) {
-        Inst fc[5];
-        Inst* pcsav;
-        pcsav = hoc_pc;
-        fc[0].sym = po->sym_;
-        fc[1].i = 0;
@@ -181 +185 @@
-        fc[3].i = po->ho_->ctemplate->id;
-        fc[4].sym = po->sym_;
-hoc_pc = fc
+Inst* pcsav = save_pc(fc)
-        hoc_object_component();
-        hoc_pc = pcsav;
@@ -272 +276 @@
-                        hoc_pushx(d);
-                }else{
-                        Inst* pcsav;
-                        Inst fc[2];
-                        fc[0].sym = self->sym_;
-                        fc[1].i = narg;
-
-
+
-                        hoc_call();
-                        hoc_pc = pcsav;
@@ -349 +351 @@
-static void hocobj_objectvar(Symbol* sym) {
-        Inst fc;
-        Inst* pcsav;
-        pcsav = hoc_pc;
-        hoc_pc = &fc;
-        fc.sym = sym;
+        Inst* pcsav = save_pc(&fc);
-        hoc_objectvar();
-        hoc_pc = pcsav;
@@ -414 +414 @@
-                break;
-        case STRING: // char*
-
-
-
+
+
-                hoc_push_string();
+                hoc_pc = pcsav;
-                result = Py_BuildValue("s", *hoc_strpop());
-                hoc_pc = pcsav;
-                break;
-        case OBJECTVAR: // Object*
-                if (!ISARRAY(sym)) {
-
-
-
+
+
-                        hoc_objectvar();
-                        hoc_pc = pcsav;
@@ -453 +451 @@
-                break;
-        default: // otherwise
+                char e[200];
+                sprintf(e, "no HocObject interface for %s (hoc type %d)", n, sym->type);
+                PyErr_SetString(PyExc_TypeError, e);
-                break;
-        }
@@ -509 +510 @@
-                break;
-        case STRING: // char*
-
-
-
+
+
-                hoc_push_string();
-                hoc_pc = pcsav;