[Numpy-svn] r3526 - trunk/numpy/doc/pyrex

numpy-svn at scipy.org numpy-svn at scipy.org
Wed Jan 31 11:57:43 CST 2007


Author: rkern
Date: 2007-01-31 11:57:42 -0600 (Wed, 31 Jan 2007)
New Revision: 3526

Modified:
   trunk/numpy/doc/pyrex/c_numpy.pxd
   trunk/numpy/doc/pyrex/numpyx.c
Log:
Correct c_numpy.pxd

Modified: trunk/numpy/doc/pyrex/c_numpy.pxd
===================================================================
--- trunk/numpy/doc/pyrex/c_numpy.pxd	2007-01-31 13:32:31 UTC (rev 3525)
+++ trunk/numpy/doc/pyrex/c_numpy.pxd	2007-01-31 17:57:42 UTC (rev 3526)
@@ -59,6 +59,8 @@
         NPY_UPDATE_ALL 
 
     cdef enum defines:
+        # Note: as of Pyrex 0.9.5, enums are type-checked more strictly, so this
+        # can't be used as an integer.
         NPY_MAXDIMS
 
     ctypedef struct npy_cdouble:
@@ -95,8 +97,10 @@
         cdef int numiter
         cdef npy_intp size, index
         cdef int nd
-        cdef npy_intp dimensions[NPY_MAXDIMS]
-        cdef flatiter iters[NPY_MAXDIMS]
+        # These next two should be arrays of [NPY_MAXITER], but that is
+        # difficult to cleanly specify in Pyrex. Fortunately, it doesn't matter.
+        cdef npy_intp *dimensions
+        cdef void **iters
 
     object PyArray_ZEROS(int ndims, npy_intp* dims, NPY_TYPES type_num, int fortran)
     object PyArray_EMPTY(int ndims, npy_intp* dims, NPY_TYPES type_num, int fortran)

Modified: trunk/numpy/doc/pyrex/numpyx.c
===================================================================
--- trunk/numpy/doc/pyrex/numpyx.c	2007-01-31 13:32:31 UTC (rev 3525)
+++ trunk/numpy/doc/pyrex/numpyx.c	2007-01-31 17:57:42 UTC (rev 3526)
@@ -1,4 +1,4 @@
-/* Generated by Pyrex 0.9.4.1 on Fri Jun 30 17:22:06 2006 */
+/* Generated by Pyrex 0.9.5.1 on Wed Jan 31 11:57:10 2007 */
 
 #include "Python.h"
 #include "structmember.h"
@@ -17,26 +17,6 @@
 
 typedef struct {PyObject **p; char *s;} __Pyx_InternTabEntry; /*proto*/
 typedef struct {PyObject **p; char *s; long n;} __Pyx_StringTabEntry; /*proto*/
-static PyObject *__Pyx_UnpackItem(PyObject *, int); /*proto*/
-static int __Pyx_EndUnpack(PyObject *, int); /*proto*/
-static int __Pyx_PrintItem(PyObject *); /*proto*/
-static int __Pyx_PrintNewline(void); /*proto*/
-static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
-static void __Pyx_ReRaise(void); /*proto*/
-static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/
-static PyObject *__Pyx_GetExcValue(void); /*proto*/
-static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed, char *name); /*proto*/
-static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
-static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[], int nargs, PyObject **args2, PyObject **kwds2); /*proto*/
-static void __Pyx_WriteUnraisable(char *name); /*proto*/
-static void __Pyx_AddTraceback(char *funcname); /*proto*/
-static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, long size);  /*proto*/
-static int __Pyx_SetVtable(PyObject *dict, void *vtable); /*proto*/
-static int __Pyx_GetVtable(PyObject *dict, void *vtabptr); /*proto*/
-static PyObject *__Pyx_CreateClass(PyObject *bases, PyObject *dict, PyObject *name, char *modname); /*proto*/
-static int __Pyx_InternStrings(__Pyx_InternTabEntry *t); /*proto*/
-static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/
-static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/
 
 static PyObject *__pyx_m;
 static PyObject *__pyx_b;
@@ -44,6 +24,23 @@
 static char *__pyx_filename;
 static char **__pyx_f;
 
+static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed, char *name); /*proto*/
+
+static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/
+
+static int __Pyx_PrintItem(PyObject *); /*proto*/
+static int __Pyx_PrintNewline(void); /*proto*/
+
+static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/
+
+static int __Pyx_InternStrings(__Pyx_InternTabEntry *t); /*proto*/
+
+static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/
+
+static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, long size);  /*proto*/
+
+static void __Pyx_AddTraceback(char *funcname); /*proto*/
+
 /* Declarations from c_python */
 
 
@@ -51,11 +48,14 @@
 
 static PyTypeObject *__pyx_ptype_7c_numpy_dtype = 0;
 static PyTypeObject *__pyx_ptype_7c_numpy_ndarray = 0;
+static PyTypeObject *__pyx_ptype_7c_numpy_flatiter = 0;
+static PyTypeObject *__pyx_ptype_7c_numpy_broadcast = 0;
 
 /* Declarations from numpyx */
 
 static PyObject *(__pyx_f_6numpyx_print_elements(char (*),Py_intptr_t (*),Py_intptr_t (*),int ,int ,PyObject *)); /*proto*/
 
+
 /* Implementation of numpyx */
 
 
@@ -99,7 +99,7 @@
   Py_INCREF(__pyx_v_arr);
   if (!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_arr), __pyx_ptype_7c_numpy_ndarray, 1, "arr")) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 10; goto __pyx_L1;}
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":13 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":13 */
   __pyx_1 = PyInt_FromLong(10); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; goto __pyx_L1;}
   __pyx_2 = PyNumber_Multiply(__pyx_k2p, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -107,7 +107,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__Pyx_PrintNewline() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; goto __pyx_L1;}
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":14 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":14 */
   __pyx_1 = PyInt_FromLong(((int )__pyx_v_arr)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 14; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 14; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1);
@@ -118,14 +118,14 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__Pyx_PrintNewline() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 14; goto __pyx_L1;}
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":15 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":15 */
   if (__Pyx_PrintItem(__pyx_k4p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 15; goto __pyx_L1;}
   __pyx_2 = PyInt_FromLong(__pyx_v_arr->nd); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 15; goto __pyx_L1;}
   if (__Pyx_PrintItem(__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 15; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__Pyx_PrintNewline() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 15; goto __pyx_L1;}
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":16 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":16 */
   __pyx_1 = PyInt_FromLong(((int )__pyx_v_arr->strides)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 16; goto __pyx_L1;}
   __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 16; goto __pyx_L1;}
   PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1);
@@ -136,15 +136,15 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__Pyx_PrintNewline() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 16; goto __pyx_L1;}
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":17 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":17 */
   if (__Pyx_PrintItem(__pyx_k6p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; goto __pyx_L1;}
   if (__Pyx_PrintNewline() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 17; goto __pyx_L1;}
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":18 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":18 */
   __pyx_3 = __pyx_v_arr->nd;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) {
 
-    /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":20 */
+    /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":20 */
     __pyx_2 = PyInt_FromLong(__pyx_v_i); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; goto __pyx_L1;}
     __pyx_1 = PyNumber_Remainder(__pyx_k7p, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -154,21 +154,19 @@
     if (__Pyx_PrintItem(__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     if (__Pyx_PrintNewline() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; goto __pyx_L1;}
-    __pyx_L2:;
   }
-  __pyx_L3:;
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":21 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":21 */
   if (__Pyx_PrintItem(__pyx_k8p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; goto __pyx_L1;}
   if (__Pyx_PrintNewline() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; goto __pyx_L1;}
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":22 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":22 */
   __pyx_1 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_n_dtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; goto __pyx_L1;}
   __pyx_2 = __pyx_f_6numpyx_print_elements(__pyx_v_arr->data,__pyx_v_arr->strides,__pyx_v_arr->dimensions,__pyx_v_arr->nd,(sizeof(double )),__pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   Py_DECREF(__pyx_2); __pyx_2 = 0;
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":24 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":24 */
   __pyx_1 = PyInt_FromLong(10); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;}
   __pyx_2 = PyNumber_Multiply(__pyx_k9p, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -176,7 +174,7 @@
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   if (__Pyx_PrintNewline() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;}
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":25 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":25 */
   if (__Pyx_PrintNewline() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; goto __pyx_L1;}
 
   __pyx_r = Py_None; Py_INCREF(Py_None);
@@ -209,7 +207,6 @@
 
 static PyObject *__pyx_f_6numpyx_print_elements(char (*__pyx_v_data),Py_intptr_t (*__pyx_v_strides),Py_intptr_t (*__pyx_v_dimensions),int __pyx_v_nd,int __pyx_v_elsize,PyObject *__pyx_v_dtype) {
   Py_intptr_t __pyx_v_i;
-  Py_intptr_t __pyx_v_j;
   void (*__pyx_v_elptr);
   PyObject *__pyx_r;
   PyObject *__pyx_1 = 0;
@@ -220,7 +217,7 @@
   Py_intptr_t __pyx_6;
   Py_INCREF(__pyx_v_dtype);
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":36 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":36 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_dtype); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -255,7 +252,7 @@
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_5) {
 
-    /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":38 */
+    /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":38 */
     __pyx_2 = PyObject_GetAttr(__pyx_v_dtype, __pyx_n_name); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; goto __pyx_L1;}
     __pyx_3 = PyNumber_Remainder(__pyx_k10p, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; goto __pyx_L1;}
     Py_DECREF(__pyx_2); __pyx_2 = 0;
@@ -263,18 +260,18 @@
     Py_DECREF(__pyx_3); __pyx_3 = 0;
     if (__Pyx_PrintNewline() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; goto __pyx_L1;}
 
-    /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":39 */
+    /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":39 */
     __pyx_r = Py_None; Py_INCREF(Py_None);
     goto __pyx_L0;
     goto __pyx_L2;
   }
   __pyx_L2:;
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":41 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":41 */
   __pyx_5 = (__pyx_v_nd == 0);
   if (__pyx_5) {
 
-    /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":42 */
+    /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":42 */
     __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; goto __pyx_L1;}
     __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_dtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; goto __pyx_L1;}
     Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -292,10 +289,10 @@
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     if (__pyx_5) {
 
-      /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":43 */
+      /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":43 */
       __pyx_v_elptr = (((void (*(*)))__pyx_v_data)[0]);
 
-      /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":44 */
+      /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":44 */
       if (__Pyx_PrintItem(__pyx_k11p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 44; goto __pyx_L1;}
       __pyx_3 = (PyObject *)__pyx_v_elptr;
       Py_INCREF(__pyx_3);
@@ -321,7 +318,7 @@
     Py_DECREF(__pyx_2); __pyx_2 = 0;
     if (__pyx_5) {
 
-      /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":46 */
+      /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":46 */
       if (__Pyx_PrintItem(__pyx_k12p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; goto __pyx_L1;}
       __pyx_3 = PyFloat_FromDouble((((double (*))__pyx_v_data)[0])); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; goto __pyx_L1;}
       if (__Pyx_PrintItem(__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; goto __pyx_L1;}
@@ -335,11 +332,11 @@
   __pyx_5 = (__pyx_v_nd == 1);
   if (__pyx_5) {
 
-    /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":48 */
+    /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":48 */
     __pyx_6 = (__pyx_v_dimensions[0]);
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_6; ++__pyx_v_i) {
 
-      /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":49 */
+      /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":49 */
       __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; goto __pyx_L1;}
       __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_dtype); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; goto __pyx_L1;}
       Py_DECREF(__pyx_4); __pyx_4 = 0;
@@ -357,10 +354,10 @@
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       if (__pyx_5) {
 
-        /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":50 */
+        /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":50 */
         __pyx_v_elptr = (((void (*(*)))__pyx_v_data)[0]);
 
-        /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":51 */
+        /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":51 */
         if (__Pyx_PrintItem(__pyx_k13p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; goto __pyx_L1;}
         __pyx_3 = (PyObject *)__pyx_v_elptr;
         Py_INCREF(__pyx_3);
@@ -386,7 +383,7 @@
       Py_DECREF(__pyx_2); __pyx_2 = 0;
       if (__pyx_5) {
 
-        /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":53 */
+        /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":53 */
         if (__Pyx_PrintItem(__pyx_k14p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; goto __pyx_L1;}
         __pyx_3 = PyFloat_FromDouble((((double (*))__pyx_v_data)[0])); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; goto __pyx_L1;}
         if (__Pyx_PrintItem(__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; goto __pyx_L1;}
@@ -396,28 +393,24 @@
       }
       __pyx_L7:;
 
-      /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":54 */
+      /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":54 */
       __pyx_v_data = (__pyx_v_data + (__pyx_v_strides[0]));
-      __pyx_L5:;
     }
-    __pyx_L6:;
     goto __pyx_L3;
   }
   /*else*/ {
 
-    /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":56 */
+    /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":56 */
     __pyx_6 = (__pyx_v_dimensions[0]);
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_6; ++__pyx_v_i) {
 
-      /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":57 */
+      /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":57 */
       __pyx_4 = __pyx_f_6numpyx_print_elements(__pyx_v_data,(__pyx_v_strides + 1),(__pyx_v_dimensions + 1),(__pyx_v_nd - 1),__pyx_v_elsize,__pyx_v_dtype); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; goto __pyx_L1;}
       Py_DECREF(__pyx_4); __pyx_4 = 0;
 
-      /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":58 */
+      /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":58 */
       __pyx_v_data = (__pyx_v_data + (__pyx_v_strides[0]));
-      __pyx_L8:;
     }
-    __pyx_L9:;
   }
   __pyx_L3:;
 
@@ -452,31 +445,28 @@
   PyObject *__pyx_r;
   PyObject *__pyx_1 = 0;
   PyObject *__pyx_2 = 0;
-  PyObject *__pyx_3 = 0;
   static char *__pyx_argnames[] = {"arr",0};
   if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_arr)) return 0;
   Py_INCREF(__pyx_v_arr);
   if (!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_arr), __pyx_ptype_7c_numpy_ndarray, 1, "arr")) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; goto __pyx_L1;}
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":78 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":78 */
   if (__Pyx_PrintItem(__pyx_k15p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; goto __pyx_L1;}
   __pyx_1 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; goto __pyx_L1;}
-  __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; goto __pyx_L1;}
-  __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; goto __pyx_L1;}
+  __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
+  if (__Pyx_PrintItem(__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
-  if (__Pyx_PrintItem(__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; goto __pyx_L1;}
-  Py_DECREF(__pyx_3); __pyx_3 = 0;
   if (__Pyx_PrintNewline() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; goto __pyx_L1;}
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":79 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":79 */
   if (__Pyx_PrintItem(__pyx_k16p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; goto __pyx_L1;}
   __pyx_1 = PyInt_FromLong(__pyx_v_arr->nd); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; goto __pyx_L1;}
   if (__Pyx_PrintItem(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
   if (__Pyx_PrintNewline() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; goto __pyx_L1;}
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":80 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":80 */
   if (__Pyx_PrintItem(__pyx_k17p) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; goto __pyx_L1;}
   __pyx_2 = PyInt_FromLong(__pyx_v_arr->flags); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; goto __pyx_L1;}
   if (__Pyx_PrintItem(__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; goto __pyx_L1;}
@@ -488,7 +478,6 @@
   __pyx_L1:;
   Py_XDECREF(__pyx_1);
   Py_XDECREF(__pyx_2);
-  Py_XDECREF(__pyx_3);
   __Pyx_AddTraceback("numpyx.test_methods");
   __pyx_r = 0;
   __pyx_L0:;
@@ -529,7 +518,7 @@
   __pyx_v_arr5 = Py_None; Py_INCREF(Py_None);
   __pyx_v_arr = Py_None; Py_INCREF(Py_None);
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":84 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":84 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 84; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 84; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -551,7 +540,7 @@
   __pyx_v_arr1 = __pyx_4;
   __pyx_4 = 0;
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":85 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":85 */
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 85; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 85; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -582,7 +571,7 @@
   __pyx_v_arr2 = __pyx_4;
   __pyx_4 = 0;
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":87 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":87 */
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; goto __pyx_L1;}
   __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_arange); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -604,7 +593,7 @@
   __pyx_v_arr3 = __pyx_5;
   __pyx_5 = 0;
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":88 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":88 */
   __pyx_3 = PyInt_FromLong(3); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; goto __pyx_L1;}
   __pyx_2 = PyInt_FromLong(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; goto __pyx_L1;}
   __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; goto __pyx_L1;}
@@ -615,13 +604,13 @@
   if (PyObject_SetAttr(__pyx_v_arr3, __pyx_n_shape, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":90 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":90 */
   __pyx_4 = PyInt_FromLong(4); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; goto __pyx_L1;}
   Py_DECREF(__pyx_v_four);
   __pyx_v_four = __pyx_4;
   __pyx_4 = 0;
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":91 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":91 */
   __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 91; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_array); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 91; goto __pyx_L1;}
   Py_DECREF(__pyx_5); __pyx_5 = 0;
@@ -652,7 +641,7 @@
   __pyx_v_arr4 = __pyx_2;
   __pyx_2 = 0;
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":93 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":93 */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_numpy); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; goto __pyx_L1;}
   __pyx_3 = PyObject_GetAttr(__pyx_1, __pyx_n_array); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
@@ -676,7 +665,7 @@
   __pyx_v_arr5 = __pyx_5;
   __pyx_5 = 0;
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":95 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":95 */
   __pyx_2 = PyList_New(5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 95; goto __pyx_L1;}
   Py_INCREF(__pyx_v_arr1);
   PyList_SET_ITEM(__pyx_2, 0, __pyx_v_arr1);
@@ -691,7 +680,6 @@
   __pyx_1 = PyObject_GetIter(__pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 95; goto __pyx_L1;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   for (;;) {
-    __pyx_L2:;
     __pyx_3 = PyIter_Next(__pyx_1);
     if (!__pyx_3) {
       if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 95; goto __pyx_L1;}
@@ -701,7 +689,7 @@
     __pyx_v_arr = __pyx_3;
     __pyx_3 = 0;
 
-    /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":96 */
+    /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":96 */
     __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n_print_array_info); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; goto __pyx_L1;}
     __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; goto __pyx_L1;}
     Py_INCREF(__pyx_v_arr);
@@ -711,7 +699,6 @@
     Py_DECREF(__pyx_5); __pyx_5 = 0;
     Py_DECREF(__pyx_2); __pyx_2 = 0;
   }
-  __pyx_L3:;
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
   __pyx_r = Py_None; Py_INCREF(Py_None);
@@ -795,18 +782,20 @@
   if (PyObject_SetAttrString(__pyx_m, "__builtins__", __pyx_b) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; goto __pyx_L1;};
   if (__Pyx_InternStrings(__pyx_intern_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; goto __pyx_L1;};
   if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 3; goto __pyx_L1;};
-  __pyx_ptype_7c_numpy_dtype = __Pyx_ImportType("numpy", "dtype", sizeof(PyArray_Descr)); if (!__pyx_ptype_7c_numpy_dtype) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 34; goto __pyx_L1;}
-  __pyx_ptype_7c_numpy_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject)); if (!__pyx_ptype_7c_numpy_ndarray) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 39; goto __pyx_L1;}
+  __pyx_ptype_7c_numpy_dtype = __Pyx_ImportType("numpy", "dtype", sizeof(PyArray_Descr)); if (!__pyx_ptype_7c_numpy_dtype) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 76; goto __pyx_L1;}
+  __pyx_ptype_7c_numpy_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject)); if (!__pyx_ptype_7c_numpy_ndarray) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 81; goto __pyx_L1;}
+  __pyx_ptype_7c_numpy_flatiter = __Pyx_ImportType("numpy", "flatiter", sizeof(PyArrayIterObject)); if (!__pyx_ptype_7c_numpy_flatiter) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 90; goto __pyx_L1;}
+  __pyx_ptype_7c_numpy_broadcast = __Pyx_ImportType("numpy", "broadcast", sizeof(PyArrayMultiIterObject)); if (!__pyx_ptype_7c_numpy_broadcast) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 96; goto __pyx_L1;}
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":5 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":5 */
   __pyx_1 = __Pyx_Import(__pyx_n_numpy, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 5; goto __pyx_L1;}
   if (PyObject_SetAttr(__pyx_m, __pyx_n_numpy, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 5; goto __pyx_L1;}
   Py_DECREF(__pyx_1); __pyx_1 = 0;
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":8 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":8 */
   import_array();
 
-  /* "/home/oliphant/numpy/numpy/doc/pyrex/numpyx.pyx":82 */
+  /* "/Users/rkern/svn/numpy/numpy/doc/pyrex/numpyx.pyx":82 */
   return;
   __pyx_L1:;
   Py_XDECREF(__pyx_1);



More information about the Numpy-svn mailing list