From: Stefan Behnel <scoder@users.berlios.de>
Date: Fri, 4 Dec 2009 10:15:00 +0000 (+0100)
Subject: type inference for builtin/extension types
X-Git-Tag: 0.12.1~94
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=878d8413497eb55e95a3c7881f20fc1884b55b3a;p=cython.git

type inference for builtin/extension types
---

diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
index f765e527..c475d7af 100644
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@ -1073,7 +1073,7 @@ class NameNode(AtomicExprNode):
                 self.name == self.entry.type.name:
             # Unfortunately the type attribute of type objects
             # is used for the pointer to the type they represent.
-            return self.entry.type # type_type
+            return type_type
         else:
             return self.entry.type
     
@@ -2400,19 +2400,22 @@ class SimpleCallNode(CallNode):
         return self.function.type_dependencies(env)
     
     def infer_type(self, env):
-        func_type = self.function.infer_type(env)
+        function = self.function
+        func_type = function.infer_type(env)
         if func_type.is_ptr:
             func_type = func_type.base_type
         if func_type.is_cfunction:
             return func_type.return_type
-        elif func_type.is_extension_type:
-            return func_type
-        elif func_type.is_builtin_type and \
-                 func_type.name in Builtin.types_that_construct_their_instance:
-            return func_type
-        else:
-            return py_object_type            
-    
+        elif func_type is type_type:
+            if function.is_name and function.entry and function.entry.type:
+                result_type = function.entry.type
+                if result_type.is_extension_type:
+                    return result_type
+                elif result_type.is_builtin_type:
+                    if function.entry.name in Builtin.types_that_construct_their_instance:
+                        return result_type
+        return py_object_type
+
     def analyse_as_type(self, env):
         attr = self.function.as_cython_attribute()
         if attr == 'pointer':