merge

.hgtags

@@ -2,3 +2,4 @@
 67ee5a34bfc662e4e3cf989c2c8bf78a412ae8f4 0.9.8rc1
 16a746d969e2654112fc0dc081690b891c496977 Version-0.9.8
 a09347d7b470290076b983aef98707921445a038 0.9.8.1
+82084a7b654e2a133ab64ceb47e03d6e7a204990 0.9.9.2.beta

Cython/Compiler/Annotate.py

@@ -39,9 +39,8 @@ class AnnotationCCodeWriter(CCodeWriter):
         self.annotation_buffer.write(s)
         
     def mark_pos(self, pos):
-#        if pos is not None:
-#            CCodeWriter.mark_pos(self, pos)
-#        return
+        if pos is not None:
+            CCodeWriter.mark_pos(self, pos)
         if self.last_pos:
             code = self.code.get(self.last_pos[1], "")
             self.code[self.last_pos[1]] = code + self.annotation_buffer.getvalue()

Cython/Compiler/Version.py

-version = '0.9.8.1.1'
+version = '0.9.8.2.beta'

tests/errors/e_boolcoerce.pyx

+ctypedef struct struct_type_not_boolean:
+    int i
+    float f
+
+if struct_type_not_boolean:
+    print("INVALID CODE")
+
+cdef struct struct_not_boolean:
+    int i
+    float f
+
+if struct_not_boolean:
+    print("INVALID CODE")
+
+ctypedef union union_type_not_boolean:
+    int i
+    float f
+
+if union_type_not_boolean:
+    print("INVALID CODE")
+
+cdef union union_not_boolean:
+    int i
+    float f
+
+if union_not_boolean:
+    print("INVALID CODE")
+
+
+_ERRORS = u"""
+ 5:26: 'struct_type_not_boolean' is not a constant, variable or function identifier
+ 5:26: Type 'struct_type_not_boolean' not acceptable as a boolean
+
+12:21: 'struct_not_boolean' is not a constant, variable or function identifier
+12:21: Type 'struct_not_boolean' not acceptable as a boolean
+
+19:25: 'union_type_not_boolean' is not a constant, variable or function identifier
+19:25: Type 'union_type_not_boolean' not acceptable as a boolean
+
+26:20: 'union_not_boolean' is not a constant, variable or function identifier
+26:20: Type 'union_not_boolean' not acceptable as a boolean
+"""