Changeset 30

Timestamp:

05/22/07 16:36:02 (2 years ago)

Author:

hines

Message:

avoid hoc_execerror when array index error. No checking yet for the
hoc Matrix.

Files:

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

branches/pygetsetcall/src/nrnpython/nrnpy_hoc.cpp

@@ -39 +39 @@
-extern PyObject* nrnpy_cas(PyObject*, PyObject*);
-extern int section_object_seen;
+extern int vector_capacity(void*);
-/*
-Because python types have so many methods, attempt to do all set and get
@@ -656 +657 @@
-}
-
+static Symbol* sym_vec_x;
+static Symbol* sym_mat_x;
+
+static int araychk(Arrayinfo* a, PyHocObject* po, int ix) {
+        assert(a->nsub > po->nindex_);
+        int n;
+        // Hoc Vector and Matrix are special cases because the sub[]
+        // do not get filled in til just before hoc_araypt is called.
+        // at least check the vector
+        if (po->sym_ == sym_vec_x) {
+                n = vector_capacity(po->ho_->u.this_pointer);
+        }else if (po->sym_ == sym_mat_x) {
+                if (ix >= 0) return 0;
+        }else{
+                n = a->sub[po->nindex_];
+        }
+        if (ix < 0 || n <= ix) {
+//printf("ix=%d nsub=%d nindex=%d sub[nindex]=%d\n", ix, a->nsub, po->nindex_, a->sub[po->nindex_]);
+                char e[200];
+                sprintf(e, "%s%s%s", po->ho_?hoc_object_name(po->ho_):"",
+                        (po->ho_ && po->sym_) ? "." : "",
+                        po->sym_ ? po->sym_->name : "");
+                PyErr_SetString(PyExc_IndexError, e);
+                return -1;
+        }
+        return 0;
+}
+
-/*
-Had better be an array. But the same ambiguity as with getattro
@@ -672 +701 @@
-        assert(po->type_ == 3);
-        Arrayinfo* a = hocobj_aray(po->sym_, po->ho_);
+        if (araychk(a, po, ix)) {
+                return NULL;
+        }
-        if (a->nsub - 1 >  po->nindex_) { // another intermediate
-                PyHocObject* ponew = intermediate(po, po->sym_, ix);
@@ -726 +758 @@
-        if (a->nsub - 1 !=  po->nindex_) {
-                PyErr_SetString(PyExc_TypeError, "wrong number of subscripts");
+                return -1;
+        }
+        if (araychk(a, po, i)) {
-                return -1;
-        }
@@ -1026 +1061 @@
-        PyModule_AddObject(m, "HocObject", (PyObject*)hocobject_type);
-
+        Symbol* s;
+        s = hoc_lookup("Vector"); assert(s);
+        sym_vec_x = hoc_table_lookup("x", s->u.ctemplate->symtable); assert(sym_vec_x);
+        s = hoc_lookup("Matrix"); assert(s);
+        sym_mat_x = hoc_table_lookup("x", s->u.ctemplate->symtable); assert(sym_mat_x);
+
-#ifdef WITH_NUMPY
-