From d83cb9e261d64d77028269980be84c3a0c9a4b5d Mon Sep 17 00:00:00 2001 From: Stefan Behnel <stefan_ml@behnel.de> Date: Mon, 12 Mar 2012 13:19:56 +0100 Subject: [PATCH] remove unused parameters from utility function signature --HG-- extra : transplant_source : GI%ADU%5E%CEId%CET6%90%8D%F8%AB%CCr%3FCy --- Cython/Compiler/Optimize.py | 5 +---- Cython/Utility/Optimize.c | 8 ++++---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Cython/Compiler/Optimize.py b/Cython/Compiler/Optimize.py index 633263200..0bba40e0d 100644 --- a/Cython/Compiler/Optimize.py +++ b/Cython/Compiler/Optimize.py @@ -686,8 +686,7 @@ class IterationTransform(Visitor.VisitorTransform): "__Pyx_dict_iterator", self.PyDict_Iterator_func_type, utility_code = UtilityCode.load_cached("dict_iter", "Optimize.c"), - args = [dict_obj, flag_node(keys), flag_node(values), - flag_node(dict_obj.type is Builtin.dict_type), + args = [dict_obj, flag_node(dict_obj.type is Builtin.dict_type), method_node, dict_len_temp_addr, is_dict_temp_addr, ], is_temp=True, @@ -710,8 +709,6 @@ class IterationTransform(Visitor.VisitorTransform): PyDict_Iterator_func_type = PyrexTypes.CFuncType( PyrexTypes.py_object_type, [ PyrexTypes.CFuncTypeArg("dict", PyrexTypes.py_object_type, None), - PyrexTypes.CFuncTypeArg("keys", PyrexTypes.c_int_type, None), - PyrexTypes.CFuncTypeArg("values", PyrexTypes.c_int_type, None), PyrexTypes.CFuncTypeArg("is_dict", PyrexTypes.c_int_type, None), PyrexTypes.CFuncTypeArg("method_name", PyrexTypes.py_object_type, None), PyrexTypes.CFuncTypeArg("p_orig_length", PyrexTypes.c_py_ssize_t_ptr_type, None), diff --git a/Cython/Utility/Optimize.c b/Cython/Utility/Optimize.c index 1e6aa64f9..0cfd05b32 100644 --- a/Cython/Utility/Optimize.c +++ b/Cython/Utility/Optimize.c @@ -301,16 +301,16 @@ static CYTHON_INLINE PyObject* __Pyx_PyDict_Clear(PyObject* d) { /////////////// dict_iter.proto /////////////// -static CYTHON_INLINE PyObject* __Pyx_dict_iterator(PyObject* dict, int keys, int values, int is_dict, - PyObject* method_name, Py_ssize_t* p_orig_length, int* p_is_dict); +static CYTHON_INLINE PyObject* __Pyx_dict_iterator(PyObject* dict, int is_dict, PyObject* method_name, + Py_ssize_t* p_orig_length, int* p_is_dict); static CYTHON_INLINE int __Pyx_dict_iter_next(PyObject* dict_or_iter, Py_ssize_t orig_length, Py_ssize_t* ppos, PyObject** pkey, PyObject** pvalue, PyObject** pitem, int is_dict); /////////////// dict_iter /////////////// //@requires: ObjectHandling.c::UnpackTuple2 -static CYTHON_INLINE PyObject* __Pyx_dict_iterator(PyObject* dict, int keys, int values, int is_dict, - PyObject* method_name, Py_ssize_t* p_orig_length, int* p_is_dict) { +static CYTHON_INLINE PyObject* __Pyx_dict_iterator(PyObject* dict, int is_dict, PyObject* method_name, + Py_ssize_t* p_orig_length, int* p_is_dict) { #if !CYTHON_COMPILING_IN_PYPY if (is_dict || likely(PyDict_CheckExact(dict))) { *p_is_dict = 1; -- 2.30.9