Reworking of list conversion (needs to always analyse to a PyObject first to play...

diff --git a/Cython/Compiler/Errors.py b/Cython/Compiler/Errors.py
index a8ad03aff4dfeb8d89abcec68802fb2a4988a473..c7c6cae99b2e83fee7e8141d05f5648f24c1f5b2 100644 (file)
--- a/Cython/Compiler/Errors.py
+++ b/Cython/Compiler/Errors.py
@@ -90,16 +90,19 @@ def close_listing_file():
         listing_file = None
 
 def report_error(err):
-    global num_errors
-    # See Main.py for why dual reporting occurs. Quick fix for now.
-    if err.reported: return
-    err.reported = True
-    line = "%s\n" % err
-    if listing_file:
-        listing_file.write(line)
-    if echo_file:
-        echo_file.write(line)
-    num_errors = num_errors + 1
+    if error_stack:
+        error_stack[-1].append(err)
+    else:
+        global num_errors
+        # See Main.py for why dual reporting occurs. Quick fix for now.
+        if err.reported: return
+        err.reported = True
+        line = "%s\n" % err
+        if listing_file:
+            listing_file.write(line)
+        if echo_file:
+            echo_file.write(line)
+        num_errors = num_errors + 1
 
 def error(position, message):
     #print "Errors.error:", repr(position), repr(message) ###
@@ -120,3 +123,19 @@ def warning(position, message, level=0):
     if echo_file:
         echo_file.write(line)
     return warn
+
+# These functions can be used to momentarily suppress errors. 
+
+error_stack = []
+
+def hold_errors():
+    error_stack.append([])
+
+def release_errors(ignore=False):
+    held_errors = error_stack.pop()
+    if not ignore:
+        for err in held_errors:
+            report_error(err)
+
+def held_errors():
+    return error_stack[-1]

diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
index 9ea1325b884f63d77890087cc2ba426d9b8d8ed8..04b7e794a02e1def9e40152335f8c1bc55327ca9 100644 (file)
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@ -6,6 +6,7 @@ import operator
 from string import join
 
 from Errors import error, warning, InternalError
+from Errors import hold_errors, release_errors, held_errors, report_error
 import StringEncoding
 import Naming
 from Nodes import Node
@@ -668,7 +669,10 @@ class IntNode(ConstNode):
     type = PyrexTypes.c_long_type
 
     def coerce_to(self, dst_type, env):
-        # Arrange for a Python version of the string to be pre-allocated
+        if dst_type.is_numeric:
+            self.type = PyrexTypes.c_long_type
+            return self
+        # Arrange for a Python version of the number to be pre-allocated
         # when coercing to a Python type.
         if dst_type.is_pyobject:
             self.entry = env.get_py_num(self.value, self.longness)
@@ -730,6 +734,10 @@ class StringNode(ConstNode):
             return sizeof_node.arg_type
     
     def coerce_to(self, dst_type, env):
+        if dst_type == PyrexTypes.c_char_ptr_type:
+            self.type = PyrexTypes.c_char_ptr_type
+            return self
+            
         if dst_type.is_int:
             if not self.type.is_pyobject and len(self.entry.init) == 1:
                 return CharNode(self.pos, value=self.value)
@@ -752,7 +760,7 @@ class StringNode(ConstNode):
         # but whose type is a Python type instead of a C type.
         entry = self.entry
         env.add_py_string(entry)
-        return StringNode(self.pos, entry = entry, type = py_object_type)
+        return StringNode(self.pos, value = self.value, entry = entry, type = py_object_type)
             
     def calculate_result_code(self):
         if self.type.is_pyobject:
@@ -1206,6 +1214,7 @@ class ImportNode(ExprNode):
         self.module_name = self.module_name.coerce_to_pyobject(env)
         if self.name_list:
             self.name_list.analyse_types(env)
+            self.name_list.coerce_to_pyobject(env)
         self.type = py_object_type
         self.gil_check(env)
         self.is_temp = 1
@@ -2655,30 +2664,38 @@ class TupleNode(SequenceNode):
 
 class ListNode(SequenceNode):
     #  List constructor.
+    
+    # obj_conversion_errors    [PyrexError]   used internally
+    # orignial_args            [ExprNode]     used internally
 
     gil_message = "Constructing Python list"
 
+    def analyse_expressions(self, env):
+        ExprNode.analyse_expressions(self, env)
+        self.coerce_to_pyobject(env)
+
     def analyse_types(self, env):
-        for arg in self.args:
-            arg.analyse_types(env)
-        self.is_temp = 1
-        self.type = PyrexTypes.unspecified_type
+        hold_errors()
+        self.original_args = list(self.args)
+        SequenceNode.analyse_types(self, env)
+        self.type = list_type
+        self.obj_conversion_errors = held_errors()
+        release_errors(ignore=True)
         
     def coerce_to(self, dst_type, env):
         if dst_type.is_pyobject:
-            self.gil_check(env)
-            self.type = list_type
-            for i in range(len(self.args)):
-                arg = self.args[i]
-                if not arg.type.is_pyobject:
-                    self.args[i] = arg.coerce_to_pyobject(env)
+            for err in self.obj_conversion_errors:
+                report_error(err)
+            self.obj_conversion_errors = []
             if not self.type.subtype_of(dst_type):
                 error(self.pos, "Cannot coerce list to type '%s'" % dst_type)
         elif dst_type.is_ptr:
             base_type = dst_type.base_type
             self.type = dst_type
-            for i in range(len(self.args)):
+            for i in range(len(self.original_args)):
                 arg = self.args[i]
+                if isinstance(arg, CoerceToPyTypeNode):
+                    arg = arg.arg
                 self.args[i] = arg.coerce_to(base_type, env)
         elif dst_type.is_struct:
             if len(self.args) > len(dst_type.scope.var_entries):
@@ -2686,7 +2703,9 @@ class ListNode(SequenceNode):
             else:
                 if len(self.args) < len(dst_type.scope.var_entries):
                     warning(self.pos, "Too few members for '%s'" % dst_type, 1)
-                for i, (arg, member) in enumerate(zip(self.args, dst_type.scope.var_entries)):
+                for i, (arg, member) in enumerate(zip(self.original_args, dst_type.scope.var_entries)):
+                    if isinstance(arg, CoerceToPyTypeNode):
+                        arg = arg.arg
                     self.args[i] = arg.coerce_to(member.type, env)
             self.type = dst_type
         else:
@@ -2699,6 +2718,8 @@ class ListNode(SequenceNode):
 
     def generate_operation_code(self, code):
         if self.type.is_pyobject:
+            for err in self.obj_conversion_errors:
+                report_error(err)
             code.putln("%s = PyList_New(%s); %s" %
                 (self.result(),
                 len(self.args),
@@ -2719,12 +2740,14 @@ class ListNode(SequenceNode):
                 code.put(", ")
             code.putln();
             code.putln("};")
-        else:
+        elif self.type.is_struct or 1:
             for arg, member in zip(self.args, self.type.scope.var_entries):
                 code.putln("%s.%s = %s;" % (
                         self.result(),
                         member.cname,
                         arg.result()))
+        else:
+            raise InternalError("List type never specified")
                 
     def generate_subexpr_disposal_code(self, code):
         # We call generate_post_assignment_code here instead
@@ -4217,7 +4240,7 @@ class PyTypeTestNode(CoercionNode):
     def generate_post_assignment_code(self, code):
         self.arg.generate_post_assignment_code(code)
                 
-                
+
 class CoerceToPyTypeNode(CoercionNode):
     #  This node is used to convert a C data type
     #  to a Python object.
@@ -4402,7 +4425,7 @@ class PersistentNode(ExprNode):
             self.result_ctype = self.arg.result_ctype
             self.is_temp = 1
         self.analyse_counter += 1
-    
+        
     def calculate_result_code(self):
         return self.result()
 

diff --git a/Cython/Compiler/Optimize.py b/Cython/Compiler/Optimize.py
index 1d7d351aaaf52a788bc47d542286735a8a65e0aa..50f8c7c08404092784ebc513d9547c85dc5833dd 100644 (file)
--- a/Cython/Compiler/Optimize.py
+++ b/Cython/Compiler/Optimize.py
@@ -162,12 +162,16 @@ class FinalOptimizePhase(Visitor.CythonTransform):
 
     def visit_SimpleCallNode(self, node):
         self.visitchildren(node)
-        if node.function.type.is_cfunction and isinstance(node.function, ExprNodes.NameNode):
+        if 0 and node.function.type.is_cfunction and isinstance(node.function, ExprNodes.NameNode):
             if node.function.name == 'isinstance':
                 type_arg = node.args[1]
                 if type_arg.type.is_builtin_type and type_arg.type.name == 'type':
+                    print type_arg.pos
                     object_module = self.context.find_module('python_object')
+                    print object_module
+                    print object_module.entries
                     node.function.entry = object_module.lookup('PyObject_TypeCheck')
+                    print node.function.entry
                     node.function.type = node.function.entry.type
                     PyTypeObjectPtr = PyrexTypes.CPtrType(object_module.lookup('PyTypeObject').type)
                     node.args[1] = ExprNodes.CastNode(node.args[1], PyTypeObjectPtr)

diff --git a/Cython/Includes/python_object.pxd b/Cython/Includes/python_object.pxd
index 57ebc7c17c46012121bd1dc0e8886e7e5d24e191..1945286f06ec8606b1d9aca6cfe5843be4271d7c 100644 (file)
--- a/Cython/Includes/python_object.pxd
+++ b/Cython/Includes/python_object.pxd
@@ -1,7 +1,7 @@
 cdef extern from "Python.h":
     ctypedef void PyObject
     ctypedef void PyTypeObject
-    ctypedef struct FILE    
+    ctypedef struct FILE
     
     #####################################################################
     # 6.1 Object Protocol