cleanup and simplification, moved some optimised builtin list methods into the transf...

diff --git a/Cython/Compiler/Builtin.py b/Cython/Compiler/Builtin.py
index 25374457059337b3528ed6649052a09aa7508c53..777356a55ebb04302f66ae84eb95def0c96428de 100644 (file)
--- a/Cython/Compiler/Builtin.py
+++ b/Cython/Compiler/Builtin.py
@@ -102,10 +102,7 @@ builtin_types_table = [
 
     ("tuple",   "PyTuple_Type",    []),
 
-    ("list",    "PyList_Type",     [("append", "OO",   "i", "PyList_Append"),
-                                    ("insert", "OZO",  "i", "PyList_Insert"),
-#                                    ("sort",   "O",    "i", "PyList_Sort"), # has optional arguments
-                                    ("reverse","O",    "i", "PyList_Reverse")]),
+    ("list",    "PyList_Type",     [("insert", "OZO",  "i", "PyList_Insert")]),
 
     ("dict",    "PyDict_Type",     [("items", "O",   "O", "PyDict_Items"),
                                     ("keys",  "O",   "O", "PyDict_Keys"),

diff --git a/Cython/Compiler/Optimize.py b/Cython/Compiler/Optimize.py
index 425fd8a0bd50ee8af7af124f32d38c2e4938b6d7..3fcc03ad2376e0026714dbc7f49f8b2490eb3097 100644 (file)
--- a/Cython/Compiler/Optimize.py
+++ b/Cython/Compiler/Optimize.py
@@ -425,20 +425,25 @@ class OptimiseBuiltinCalls(Visitor.VisitorTransform):
 
     def visit_GeneralCallNode(self, node):
         self.visitchildren(node)
-        handler = self._find_handler('general', node.function)
-        if handler is not None:
-            node = handler(node, node.positional_args, node.keyword_args)
-        return node
+        function = node.function
+        if not function.type.is_pyobject:
+            return node
+        arg_tuple = node.positional_args
+        if not isinstance(arg_tuple, ExprNodes.TupleNode):
+            return node
+        return self._dispatch_to_handler(
+            node, function, arg_tuple, node.keyword_args)
 
     def visit_SimpleCallNode(self, node):
         self.visitchildren(node)
-        pos_args = node.arg_tuple
-        if not isinstance(pos_args, ExprNodes.TupleNode):
+        function = node.function
+        if not function.type.is_pyobject:
             return node
-        handler = self._find_handler('simple', node.function)
-        if handler is not None:
-            node = handler(node, pos_args)
-        return node
+        arg_tuple = node.arg_tuple
+        if not isinstance(arg_tuple, ExprNodes.TupleNode):
+            return node
+        return self._dispatch_to_handler(
+            node, node.function, arg_tuple)
 
     def visit_PyTypeTestNode(self, node):
         """Flatten redundant type checks after tree changes.
@@ -449,35 +454,58 @@ class OptimiseBuiltinCalls(Visitor.VisitorTransform):
             return node
         return node.arg
 
-    def _find_handler(self, call_type, function):
-        if not function.type.is_pyobject:
-            return None
+    def _find_handler(self, match_name, has_kwargs):
+        call_type = has_kwargs and 'general' or 'simple'
+        handler = getattr(self, '_handle_%s_%s' % (call_type, match_name), None)
+        if handler is None:
+            handler = getattr(self, '_handle_any_%s' % match_name, None)
+        return handler
+
+    def _dispatch_to_handler(self, node, function, arg_tuple, kwargs=None):
         if function.is_name:
-            if not function.type.is_builtin_type and '_' in function.name:
-                # not interesting anyway, so let's play safe here
-                return None
-            match_name = function.name
+            match_name = "_function_%s" % function.name
+            function_handler = self._find_handler(
+                "function_%s" % function.name, kwargs)
+            if function_handler is None:
+                return node
+            if kwargs:
+                return function_handler(node, arg_tuple, kwargs)
+            else:
+                return function_handler(node, arg_tuple)
         elif isinstance(function, ExprNodes.AttributeNode):
-            if not function.obj.type.is_builtin_type:
+            arg_list = arg_tuple.args
+            self_arg = function.obj
+            obj_type = self_arg.type
+            if obj_type.is_builtin_type:
+                if obj_type is Builtin.type_type and arg_list and \
+                         arg_list[0].type.is_pyobject:
+                    # calling an unbound method like 'list.append(L,x)'
+                    # (ignoring 'type.mro()' here ...)
+                    type_name = function.obj.name
+                    self_arg = None
+                else:
+                    type_name = obj_type.name
+            else:
                 type_name = "object" # safety measure
+            method_handler = self._find_handler(
+                "method_%s_%s" % (type_name, function.attribute), kwargs)
+            if method_handler is None:
+                return node
+            if self_arg is not None:
+                arg_list = [self_arg] + list(arg_list)
+            if kwargs:
+                return method_handler(node, arg_list, kwargs)
             else:
-                type_name = function.obj.type.name
-            match_name = "%s_%s" % (type_name, function.attribute)
+                return method_handler(node, arg_list)
         else:
-            return None
-        handler = getattr(self, '_handle_%s_%s' % (call_type, match_name), None)
-        if handler is None:
-            handler = getattr(self, '_handle_any_%s' % match_name, None)
-        return handler
+            return node
 
     ### builtin types
 
-    def _handle_general_dict(self, node, pos_args, kwargs):
+    def _handle_general_function_dict(self, node, pos_args, kwargs):
         """Replace dict(a=b,c=d,...) by the underlying keyword dict
         construction which is done anyway.
         """
-        if not isinstance(pos_args, ExprNodes.TupleNode):
-            return node
         if len(pos_args.args) > 0:
             return node
         if not isinstance(kwargs, ExprNodes.DictNode):
@@ -487,7 +515,7 @@ class OptimiseBuiltinCalls(Visitor.VisitorTransform):
             return node
         return kwargs
 
-    def _handle_simple_set(self, node, pos_args):
+    def _handle_simple_function_set(self, node, pos_args):
         """Replace set([a,b,...]) by a literal set {a,b,...}.
         """
         arg_count = len(pos_args.args)
@@ -515,7 +543,7 @@ class OptimiseBuiltinCalls(Visitor.VisitorTransform):
             PyrexTypes.CFuncTypeArg("list", Builtin.list_type, None)
             ])
 
-    def _handle_simple_tuple(self, node, pos_args):
+    def _handle_simple_function_tuple(self, node, pos_args):
         """Replace tuple([...]) by a call to PyList_AsTuple.
         """
         if len(pos_args.args) != 1:
@@ -549,7 +577,7 @@ class OptimiseBuiltinCalls(Visitor.VisitorTransform):
             PyrexTypes.CFuncTypeArg("default", PyrexTypes.py_object_type, None),
             ])
 
-    def _handle_simple_getattr(self, node, pos_args):
+    def _handle_simple_function_getattr(self, node, pos_args):
         # not really a builtin *type*, but worth optimising anyway
         args = pos_args.args
         if len(args) == 2:
@@ -567,8 +595,7 @@ class OptimiseBuiltinCalls(Visitor.VisitorTransform):
                 )
         else:
             error(node.pos, "getattr() called with wrong number of args, "
-                  "expected 2 or 3, found %d" %
-                  len(pos_args.args))
+                  "expected 2 or 3, found %d" % len(args))
         return node
 
     ### methods of builtin types
@@ -579,17 +606,16 @@ class OptimiseBuiltinCalls(Visitor.VisitorTransform):
             PyrexTypes.CFuncTypeArg("item", PyrexTypes.py_object_type, None),
             ])
 
-    def _handle_simple_object_append(self, node, pos_args):
+    def _handle_simple_method_object_append(self, node, args):
         # X.append() is almost always referring to a list
-        if len(pos_args.args) != 1:
+        if len(args) != 2:
             return node
 
-        args = [node.function.obj] + pos_args.args
         return ExprNodes.PythonCapiCallNode(
             node.pos, "__Pyx_PyObject_Append", self.PyObject_Append_func_type,
             args = args,
             is_temp = node.is_temp,
-            utility_code = append_utility_code # FIXME: move to Builtin.py
+            utility_code = append_utility_code
             )
 
     PyList_Append_func_type = PyrexTypes.CFuncType(
@@ -599,35 +625,38 @@ class OptimiseBuiltinCalls(Visitor.VisitorTransform):
             ],
         exception_value = "-1")
 
-    def _handle_simple_list_append(self, node, pos_args):
-        if len(pos_args.args) != 1:
+    def _handle_simple_method_list_append(self, node, args):
+        if len(args) != 2:
             error(node.pos, "list.append(x) called with wrong number of args, found %d" %
-                  len(pos_args.args))
+                  len(args))
             return node
+        return self._substitute_method_call(
+            node, "PyList_Append", self.PyList_Append_func_type, args)
 
-        obj = node.function.obj
-        # FIXME: obj may need a None check (ticket #166)
-        args = [obj] + pos_args.args
-        return ExprNodes.PythonCapiCallNode(
-            node.pos, "PyList_Append", self.PyList_Append_func_type,
-            args = args,
-            is_temp = node.is_temp
-            )
-
-    def _handle_simple_type_append(self, node, pos_args):
-        # unbound method call to list.append(L, x) ?
-        if node.function.obj.name != 'list':
-            return node
+    single_param_func_type = PyrexTypes.CFuncType(
+        PyrexTypes.c_int_type, [
+            PyrexTypes.CFuncTypeArg("obj", PyrexTypes.py_object_type, None),
+            ],
+        exception_value = "-1")
 
-        args = pos_args.args
-        if len(args) != 2:
-            error(node.pos, "list.append(x) called with wrong number of args, found %d" %
-                  len(pos_args.args))
+    def _handle_simple_method_list_sort(self, node, args):
+        if len(args) != 1:
             return node
-
-        # FIXME: this may need a type check on the first operand
+        return self._substitute_method_call(
+            node, "PyList_Sort", self.single_param_func_type, args)
+
+    def _handle_simple_method_list_reverse(self, node, args):
+        if len(args) != 1:
+            error(node.pos, "list.reverse(x) called with wrong number of args, found %d" %
+                  len(args))
+        return self._substitute_method_call(
+            node, "PyList_Reverse", self.single_param_func_type, args)
+
+    def _substitute_method_call(self, node, name, func_type, args=()):
+        args = list(args)
+        # FIXME: args[0] may need a runtime None check (ticket #166)
         return ExprNodes.PythonCapiCallNode(
-            node.pos, "PyList_Append", self.PyList_Append_func_type,
+            node.pos, name, func_type,
             args = args,
             is_temp = node.is_temp
             )

diff --git a/tests/run/list.pyx b/tests/run/list.pyx
index b15fb2ad6ffad04ad7d95ddeffc44f9560b841b8..0c3ac2cacab86964f8c698fc6f0c70c955070c94 100644 (file)
--- a/tests/run/list.pyx
+++ b/tests/run/list.pyx
@@ -9,6 +9,10 @@ __doc__ = u"""
     [2, 3, 4]
     >>> k(1, 2, 3, 4, 5)
     [17, 42, 88]
+    >>> test_list_sort()
+    [1, 2, 3, 4]
+    >>> test_list_reverse()
+    [1, 2, 3, 4]
     >>> test_list_pop()
     (2, [1])
     >>> test_list_pop0()
@@ -37,20 +41,38 @@ def k(obj1, obj2, obj3, obj4, obj5):
     obj1 = [17, 42, 88]
     return obj1
 
+def test_list_sort():
+    cdef list l1
+    l1 = [2,3,1,4]
+    l1.sort()
+    return l1
+
+def test_list_sort_reversed():
+    cdef list l1
+    l1 = [2,3,1,4]
+    l1.sort(reversed=True)
+    return l1
+
+def test_list_reverse():
+    cdef list l1
+    l1 = [4,3,2,1]
+    l1.reverse()
+    return l1
+
 def test_list_pop():
-    cdef list s1
+    cdef list l1
     l1 = [1,2]
     two = l1.pop()
     return two, l1
 
 def test_list_pop0():
-    cdef list s1
+    cdef list l1
     l1 = [1,2]
     one = l1.pop(0)
     return one, l1
 
 def test_list_pop_all():
-    cdef list s1
+    cdef list l1
     l1 = [1,2]
     try:
         l1.pop()