move dict.*() method implementations from Optimize.c to Builtin.c

diff --git a/Cython/Compiler/Builtin.py b/Cython/Compiler/Builtin.py
index aa7d5e1..f2c1bec 100644 (file)
--- a/Cython/Compiler/Builtin.py
+++ b/Cython/Compiler/Builtin.py
@@ -282,11 +282,11 @@ builtin_types_table = [
                                     ]),
 
     ("dict",    "PyDict_Type",     [BuiltinMethod("items",  "T",   "O", "__Pyx_PyDict_Items",
-                                                  utility_code=UtilityCode.load("py_dict_items", "Optimize.c")),
+                                                  utility_code=UtilityCode.load("py_dict_items", "Builtins.c")),
                                     BuiltinMethod("keys",   "T",   "O", "__Pyx_PyDict_Keys",
-                                                  utility_code=UtilityCode.load("py_dict_keys", "Optimize.c")),
+                                                  utility_code=UtilityCode.load("py_dict_keys", "Builtins.c")),
                                     BuiltinMethod("values", "T",   "O", "__Pyx_PyDict_Values",
-                                                  utility_code=UtilityCode.load("py_dict_values", "Optimize.c")),
+                                                  utility_code=UtilityCode.load("py_dict_values", "Builtins.c")),
                                     BuiltinMethod("clear",  "T",   "r", "__Pyx_PyDict_Clear",
                                                   utility_code=UtilityCode.load("py_dict_clear", "Optimize.c")),
                                     BuiltinMethod("copy",   "T",   "T", "PyDict_Copy")]),

diff --git a/Cython/Utility/Builtins.c b/Cython/Utility/Builtins.c
index c8ec2f8..e381db3 100644 (file)
--- a/Cython/Utility/Builtins.c
+++ b/Cython/Utility/Builtins.c
@@ -243,3 +243,52 @@ static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_abs_longlong(PY_LONG_LONG x) {
 //////////////////// pow2.proto ////////////////////
 
 #define __Pyx_PyNumber_Power2(a, b) PyNumber_Power(a, b, Py_None)
+
+//////////////////// py_dict_keys.proto ////////////////////
+
+#if PY_MAJOR_VERSION >= 3
+static CYTHON_INLINE PyObject* __Pyx_PyDict_Keys(PyObject* d); /*proto*/
+#else
+#define __Pyx_PyDict_Keys(d) PyDict_Keys(d)
+#endif
+
+//////////////////// py_dict_keys ////////////////////
+
+#if PY_MAJOR_VERSION >= 3
+static CYTHON_INLINE PyObject* __Pyx_PyDict_Keys(PyObject* d) {
+    return PyObject_CallMethodObjArgs(d, PYIDENT("keys"), NULL);
+}
+#endif
+
+//////////////////// py_dict_values.proto ////////////////////
+
+#if PY_MAJOR_VERSION >= 3
+static CYTHON_INLINE PyObject* __Pyx_PyDict_Values(PyObject* d); /*proto*/
+#else
+#define __Pyx_PyDict_Values(d) PyDict_Values(d)
+#endif
+
+//////////////////// py_dict_values ////////////////////
+
+#if PY_MAJOR_VERSION >= 3
+static CYTHON_INLINE PyObject* __Pyx_PyDict_Values(PyObject* d) {
+    return PyObject_CallMethodObjArgs(d, PYIDENT("values"), NULL);
+}
+#endif
+
+//////////////////// py_dict_items.proto ////////////////////
+
+#if PY_MAJOR_VERSION >= 3
+static CYTHON_INLINE PyObject* __Pyx_PyDict_Items(PyObject* d); /*proto*/
+#else
+#define __Pyx_PyDict_Items(d) PyDict_Items(d)
+#endif
+
+//////////////////// py_dict_items ////////////////////
+
+#if PY_MAJOR_VERSION >= 3
+static CYTHON_INLINE PyObject* __Pyx_PyDict_Items(PyObject* d) {
+    return PyObject_CallMethodObjArgs(d, PYIDENT("items"), NULL);
+}
+#endif
+

diff --git a/Cython/Utility/Optimize.c b/Cython/Utility/Optimize.c
index 929b8af..df0a88f 100644 (file)
--- a/Cython/Utility/Optimize.c
+++ b/Cython/Utility/Optimize.c
@@ -347,54 +347,6 @@ static CYTHON_INLINE PyObject *__Pyx_PyDict_SetDefault(PyObject *d, PyObject *ke
 
 #define __Pyx_PyDict_Clear(d) (PyDict_Clear(d), 0)
 
-//////////////////// py_dict_keys.proto ////////////////////
-
-#if PY_MAJOR_VERSION >= 3
-static CYTHON_INLINE PyObject* __Pyx_PyDict_Keys(PyObject* d); /*proto*/
-#else
-#define __Pyx_PyDict_Keys(d) PyDict_Keys(d)
-#endif
-
-//////////////////// py_dict_keys ////////////////////
-
-#if PY_MAJOR_VERSION >= 3
-static CYTHON_INLINE PyObject* __Pyx_PyDict_Keys(PyObject* d) {
-    return PyObject_CallMethodObjArgs(d, PYIDENT("keys"), NULL);
-}
-#endif
-
-//////////////////// py_dict_values.proto ////////////////////
-
-#if PY_MAJOR_VERSION >= 3
-static CYTHON_INLINE PyObject* __Pyx_PyDict_Values(PyObject* d); /*proto*/
-#else
-#define __Pyx_PyDict_Values(d) PyDict_Values(d)
-#endif
-
-//////////////////// py_dict_values ////////////////////
-
-#if PY_MAJOR_VERSION >= 3
-static CYTHON_INLINE PyObject* __Pyx_PyDict_Values(PyObject* d) {
-    return PyObject_CallMethodObjArgs(d, PYIDENT("values"), NULL);
-}
-#endif
-
-//////////////////// py_dict_items.proto ////////////////////
-
-#if PY_MAJOR_VERSION >= 3
-static CYTHON_INLINE PyObject* __Pyx_PyDict_Items(PyObject* d); /*proto*/
-#else
-#define __Pyx_PyDict_Items(d) PyDict_Items(d)
-#endif
-
-//////////////////// py_dict_items ////////////////////
-
-#if PY_MAJOR_VERSION >= 3
-static CYTHON_INLINE PyObject* __Pyx_PyDict_Items(PyObject* d) {
-    return PyObject_CallMethodObjArgs(d, PYIDENT("items"), NULL);
-}
-#endif
-
 /////////////// dict_iter.proto ///////////////
 
 static CYTHON_INLINE PyObject* __Pyx_dict_iterator(PyObject* dict, int is_dict, PyObject* method_name,