Merge branch 'aeberspaecher/cython/ndarray-fix'

geany · Jul 15, 2013 · 80ad5c1 · 80ad5c1
2 parents 66396e7 + 3dc5422
commit 80ad5c1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/tagmanager/ctags/python.c b/tagmanager/ctags/python.c
@@ -576,7 +576,13 @@ static const char *skipTypeDecl (const char *cp, boolean *is_class)
 	}
 	/* limit so that we don't pick off "int item=obj()" */
 	while (*ptr && loopCount++ < 2) {
-		while (*ptr && *ptr != '=' && *ptr != '(' && !isspace(*ptr)) ptr++;
+		while (*ptr && *ptr != '=' && *ptr != '(' && !isspace(*ptr)) {
+			/* skip over e.g. 'cpdef numpy.ndarray[dtype=double, ndim=1]' */
+			if(*ptr == '[') {
+				while(*ptr && *ptr != ']') ptr++;
+			}
+			ptr++;
+		}
 		if (!*ptr || *ptr == '=') return NULL;
 		if (*ptr == '(') {
 		    return lastStart; /* if we stopped on a '(' we are done */

diff --git a/tests/ctags/Makefile.am b/tests/ctags/Makefile.am
@@ -113,6 +113,7 @@ test_sources = \
 	countall.sql					\
 	cpp_destructor.cpp				\
 	cython_sample.pyx				\
+	cython_sample2.pyx				\
 	cxx11enum.cpp					\
 	db-trig.sql						\
 	debian_432872.f90				\

diff --git a/tests/ctags/cython_sample2.pyx b/tests/ctags/cython_sample2.pyx
@@ -0,0 +1,11 @@
+#  -*- cython-mode -*-
+# test code for cython functionality with complex datatypes
+
+import numpy as np
+cimport numpy as np
+
+cpdef np.ndarray[dtype=double, ndim=1] my_fun(np.ndarray[dtype=double, ndim=1] x):
+    cdef np.ndarray[dtype=double, ndim=1, mode="c"] res
+
+    res = 2*x
+    return res
diff --git a/tests/ctags/cython_sample2.pyx.tags b/tests/ctags/cython_sample2.pyx.tags
@@ -0,0 +1,3 @@
+# format=tagmanager
+my_fun�16�(np.ndarray[dtype=double, ndim=1] x)�0
+np�256�0