[mypyc] Merge dict get op and generic power op

mypyc/lib-rt/dict_ops.c

@@ -63,6 +63,18 @@ PyObject *CPyDict_Get(PyObject *dict, PyObject *key, PyObject *fallback) {
     return res;
 }
 
+PyObject *CPyDict_GetWithNone(PyObject *dict, PyObject *key) {
+    PyObject *res = PyDict_GetItemWithError(dict, key);
+    if (!res) {
+        if (PyErr_Occurred()) {
+            return NULL;
+        }
+        res = Py_None;
+    }
+    Py_INCREF(res);
+    return res;
+}
+
 int CPyDict_SetItem(PyObject *dict, PyObject *key, PyObject *value) {
     if (PyDict_CheckExact(dict)) {
         return PyDict_SetItem(dict, key, value);

mypyc/lib-rt/generic_ops.c

@@ -35,3 +35,8 @@ PyObject *CPyIter_Next(PyObject *iter)
 {
     return (*iter->ob_type->tp_iternext)(iter);
 }
+
+PyObject *CPyNumber_Power(PyObject *base, PyObject *index)
+{
+    return PyNumber_Power(base, index, Py_None);
+}

mypyc/primitives/dict_ops.py

@@ -8,7 +8,7 @@
 )
 
 from mypyc.primitives.registry import (
-    method_op, simple_emit, c_custom_op, c_method_op, c_function_op, c_binary_op, load_address_op
+    c_custom_op, c_method_op, c_function_op, c_binary_op, load_address_op
 )
 
 # Get the 'dict' type object.
@@ -77,12 +77,12 @@
     error_kind=ERR_MAGIC)
 
 # dict.get(key)
-method_op(
+c_method_op(
     name='get',
     arg_types=[dict_rprimitive, object_rprimitive],
-    result_type=object_rprimitive,
-    error_kind=ERR_MAGIC,
-    emit=simple_emit('{dest} = CPyDict_Get({args[0]}, {args[1]}, Py_None);'))
+    return_type=object_rprimitive,
+    c_function_name='CPyDict_GetWithNone',
+    error_kind=ERR_MAGIC)
 
 # Construct an empty dictionary.
 dict_new_op = c_custom_op(

mypyc/primitives/generic_ops.py

@@ -14,7 +14,7 @@
     object_rprimitive, int_rprimitive, bool_rprimitive, c_int_rprimitive, pointer_rprimitive
 )
 from mypyc.primitives.registry import (
-    binary_op, simple_emit, c_binary_op, c_unary_op, c_method_op, c_function_op, c_custom_op
+    c_binary_op, c_unary_op, c_method_op, c_function_op, c_custom_op
 )
 
 
@@ -72,12 +72,12 @@
                 error_kind=ERR_MAGIC,
                 priority=0)
 
-binary_op(op='**',
-          arg_types=[object_rprimitive, object_rprimitive],
-          result_type=object_rprimitive,
-          error_kind=ERR_MAGIC,
-          emit=simple_emit('{dest} = PyNumber_Power({args[0]}, {args[1]}, Py_None);'),
-          priority=0)
+c_binary_op(name='**',
+            arg_types=[object_rprimitive, object_rprimitive],
+            return_type=object_rprimitive,
+            error_kind=ERR_MAGIC,
+            c_function_name='CPyNumber_Power',
+            priority=0)
 
 c_binary_op(
     name='in',