+1

Author: skirpichev

Modules/_decimal/_decimal.c

@@ -1651,16 +1651,18 @@ _decimal_IEEEContext_impl(PyObject *module, Py_ssize_t bits)
 /*[clinic input]
 _decimal.Context.copy
 
+    cls: defining_class
+
 Return a duplicate of the context with all flags cleared.
 [clinic start generated code]*/
 
 static PyObject *
-_decimal_Context_copy_impl(PyObject *self)
-/*[clinic end generated code: output=f99649a60a9c10f8 input=2589aa46b77cbc28]*/
+_decimal_Context_copy_impl(PyObject *self, PyTypeObject *cls)
+/*[clinic end generated code: output=31c9c8eeb0c0cf77 input=aef1c0bddabdf8f0]*/
 {
     PyObject *copy;
 
-    decimal_state *state = get_module_state_from_ctx(self);
+    decimal_state *state = PyType_GetModuleState(cls);
     copy = PyObject_CallObject((PyObject *)state->PyDecContext_Type, NULL);
     if (copy == NULL) {
         return NULL;
@@ -1673,20 +1675,51 @@ _decimal_Context_copy_impl(PyObject *self)
     return copy;
 }
 
+/*[clinic input]
+_decimal.Context.__copy__ = _decimal.Context.copy
+
+[clinic start generated code]*/
+
+static PyObject *
+_decimal_Context___copy___impl(PyObject *self, PyTypeObject *cls)
+/*[clinic end generated code: output=93552486e5fb0ab4 input=4a55dd22f6d31bcc]*/
+{
+    return _decimal_Context_copy_impl(self, cls);
+}
+
 static PyObject *
 context_copy(PyObject *self, PyObject *Py_UNUSED(dummy))
 {
-    return _decimal_Context_copy_impl(self);
+    PyObject *copy;
+
+    decimal_state *state = get_module_state_from_ctx(self);
+    copy = PyObject_CallObject((PyObject *)state->PyDecContext_Type, NULL);
+    if (copy == NULL) {
+        return NULL;
+    }
+
+    *CTX(copy) = *CTX(self);
+    CTX(copy)->newtrap = 0;
+    CtxCaps(copy) = CtxCaps(self);
+
+    return copy;
 }
 
+
+/*[clinic input]
+_decimal.Context.__reduce__ = _decimal.Context.copy
+
+[clinic start generated code]*/
+
 static PyObject *
-context_reduce(PyObject *self, PyObject *Py_UNUSED(dummy))
+_decimal_Context___reduce___impl(PyObject *self, PyTypeObject *cls)
+/*[clinic end generated code: output=4e77de55efdbb56a input=787683f13d047ce8]*/
 {
     PyObject *flags;
     PyObject *traps;
     PyObject *ret;
     mpd_context_t *ctx;
-    decimal_state *state = get_module_state_from_ctx(self);
+    decimal_state *state = PyType_GetModuleState(cls);
 
     ctx = CTX(self);
 
@@ -2978,6 +3011,7 @@ PyDecType_FromSequenceExact(PyTypeObject *type, PyObject *v,
 @classmethod
 _decimal.Decimal.from_float
 
+    cls: defining_class
     f as pyfloat: object
     /
 
@@ -2997,13 +3031,14 @@ Decimal.from_float(0.1) is not the same as Decimal('0.1').
 [clinic start generated code]*/
 
 static PyObject *
-_decimal_Decimal_from_float_impl(PyTypeObject *type, PyObject *pyfloat)
-/*[clinic end generated code: output=e62775271ac469e6 input=052036648342f8c8]*/
+_decimal_Decimal_from_float_impl(PyTypeObject *type, PyTypeObject *cls,
+                                 PyObject *pyfloat)
+/*[clinic end generated code: output=fcb7d55d2f9dc790 input=03bc8dbe963e52ca]*/
 {
     PyObject *context;
     PyObject *result;
 
-    decimal_state *state = get_module_state_by_def(type);
+    decimal_state *state = PyType_GetModuleState(cls);
     CURRENT_CONTEXT(state, context);
     result = PyDecType_FromFloatExact(state->PyDec_Type, pyfloat, context);
     if (type != state->PyDec_Type && result != NULL) {
@@ -3018,9 +3053,10 @@ _decimal_Decimal_from_float_impl(PyTypeObject *type, PyObject *pyfloat)
    an exact conversion. If the result does not meet the restrictions
    for an mpd_t, fail with InvalidOperation. */
 static PyObject *
-PyDecType_FromNumberExact(PyTypeObject *type, PyObject *v, PyObject *context)
+PyDecType_FromNumberExact(PyTypeObject *type, PyTypeObject *cls,
+                          PyObject *v, PyObject *context)
 {
-    decimal_state *state = get_module_state_by_def(type);
+    decimal_state *state = PyType_GetModuleState(cls);
     assert(v != NULL);
     if (PyDec_Check(state, v)) {
         return PyDecType_FromDecimalExact(type, v, context);
@@ -3046,6 +3082,7 @@ PyDecType_FromNumberExact(PyTypeObject *type, PyObject *v, PyObject *context)
 @classmethod
 _decimal.Decimal.from_number
 
+    cls: defining_class
     number: object
     /
 
@@ -3060,15 +3097,16 @@ Class method that converts a real number to a decimal number, exactly.
 [clinic start generated code]*/
 
 static PyObject *
-_decimal_Decimal_from_number_impl(PyTypeObject *type, PyObject *number)
-/*[clinic end generated code: output=41885304e5beea0a input=c58b678e8916f66b]*/
+_decimal_Decimal_from_number_impl(PyTypeObject *type, PyTypeObject *cls,
+                                  PyObject *number)
+/*[clinic end generated code: output=4d3ec722b7acfd8b input=271cb4feb3148804]*/
 {
     PyObject *context;
     PyObject *result;
 
-    decimal_state *state = get_module_state_by_def(type);
+    decimal_state *state = PyType_GetModuleState(cls);
     CURRENT_CONTEXT(state, context);
-    result = PyDecType_FromNumberExact(state->PyDec_Type, number, context);
+    result = PyDecType_FromNumberExact(state->PyDec_Type, cls, number, context);
     if (type != state->PyDec_Type && result != NULL) {
         Py_SETREF(result,
             PyObject_CallFunctionObjArgs((PyObject *)type, result, NULL));
@@ -3083,6 +3121,7 @@ _decimal_Decimal_from_number_impl(PyTypeObject *type, PyObject *number)
 _decimal.Context.create_decimal_from_float
 
     self as context: self
+    cls: defining_class
     f: object
     /
 
@@ -3093,10 +3132,12 @@ the context limits.
 [clinic start generated code]*/
 
 static PyObject *
-_decimal_Context_create_decimal_from_float(PyObject *context, PyObject *f)
-/*[clinic end generated code: output=c660c343f6f7158b input=05a8c54b7a5b457b]*/
+_decimal_Context_create_decimal_from_float_impl(PyObject *context,
+                                                PyTypeObject *cls,
+                                                PyObject *f)
+/*[clinic end generated code: output=a5548f5140fa0870 input=8c66eeb22b01ddd4]*/
 {
-    decimal_state *state = get_module_state_from_ctx(context);
+    decimal_state *state = PyType_GetModuleState(cls);
     return PyDec_FromFloat(state, f, context);
 }
 
@@ -3702,6 +3743,7 @@ pydec_format(PyObject *dec, PyObject *context, PyObject *fmt, decimal_state *sta
 _decimal.Decimal.__format__
 
     self as dec: self
+    cls: defining_class
     format_spec as fmtarg: unicode
     override: object = NULL
     /
@@ -3710,9 +3752,9 @@ Formats the Decimal according to format_spec.
 [clinic start generated code]*/
 
 static PyObject *
-_decimal_Decimal___format___impl(PyObject *dec, PyObject *fmtarg,
-                                 PyObject *override)
-/*[clinic end generated code: output=4b3640b7f0c8b6a5 input=e53488e49a0fff00]*/
+_decimal_Decimal___format___impl(PyObject *dec, PyTypeObject *cls,
+                                 PyObject *fmtarg, PyObject *override)
+/*[clinic end generated code: output=6d95f91bbb28b3ed input=2dbfaa0cbe243e9e]*/
 {
     PyObject *result = NULL;
     PyObject *dot = NULL;
@@ -3725,7 +3767,7 @@ _decimal_Decimal___format___impl(PyObject *dec, PyObject *fmtarg,
     uint32_t status = 0;
     int replace_fillchar = 0;
     Py_ssize_t size;
-    decimal_state *state = get_module_state_by_def(Py_TYPE(dec));
+    decimal_state *state = PyType_GetModuleState(cls);
     CURRENT_CONTEXT(state, context);
     fmt = (char *)PyUnicode_AsUTF8AndSize(fmtarg, &size);
     if (fmt == NULL) {
@@ -3929,15 +3971,17 @@ dec_as_long(PyObject *dec, PyObject *context, int round)
 /*[clinic input]
 _decimal.Decimal.as_integer_ratio
 
+    cls: defining_class
+
 Return a pair of integers whose ratio is exactly equal to the original.
 
 The ratio is in lowest terms and with a positive denominator.
 Raise OverflowError on infinities and a ValueError on NaNs.
 [clinic start generated code]*/
 
 static PyObject *
-_decimal_Decimal_as_integer_ratio_impl(PyObject *self)
-/*[clinic end generated code: output=c5d88e900080c264 input=7861cb643f01525a]*/
+_decimal_Decimal_as_integer_ratio_impl(PyObject *self, PyTypeObject *cls)
+/*[clinic end generated code: output=eb49c512701f844b input=07e33d8852184761]*/
 {
     PyObject *numerator = NULL;
     PyObject *denominator = NULL;
@@ -3960,7 +4004,7 @@ _decimal_Decimal_as_integer_ratio_impl(PyObject *self)
         return NULL;
     }
 
-    decimal_state *state = get_module_state_by_def(Py_TYPE(self));
+    decimal_state *state = PyType_GetModuleState(cls);
     CURRENT_CONTEXT(state, context);
 
     tmp = dec_alloc(state);
@@ -4130,7 +4174,7 @@ _decimal_Decimal_to_integral_exact_impl(PyObject *self, PyTypeObject *cls,
     uint32_t status = 0;
     mpd_context_t workctx;
 
-    decimal_state *state = get_module_state_by_def(Py_TYPE(self));
+    decimal_state *state = PyType_GetModuleState(cls);
     CONTEXT_CHECK_VA(state, context);
 
     workctx = *CTX(context);
@@ -4193,20 +4237,22 @@ PyDec_AsFloat(PyObject *dec)
 /*[clinic input]
 _decimal.Decimal.__round__
 
+    cls: defining_class
     ndigits: object = NULL
     /
 
 Return the Integral closest to self, rounding half toward even.
 [clinic start generated code]*/
 
 static PyObject *
-_decimal_Decimal___round___impl(PyObject *self, PyObject *ndigits)
-/*[clinic end generated code: output=ca6b3570a8df0c91 input=dc72084114f59380]*/
+_decimal_Decimal___round___impl(PyObject *self, PyTypeObject *cls,
+                                PyObject *ndigits)
+/*[clinic end generated code: output=790c2c6bd57890e6 input=d69e7178a58a66b1]*/
 {
     PyObject *result;
     uint32_t status = 0;
     PyObject *context;
-    decimal_state *state = get_module_state_by_def(Py_TYPE(self));
+    decimal_state *state = PyType_GetModuleState(cls);
     CURRENT_CONTEXT(state, context);
     if (ndigits) {
         mpd_uint_t dq[1] = {1};
@@ -5101,37 +5147,41 @@ _dec_mpd_radix(decimal_state *state)
 /*[clinic input]
 _decimal.Decimal.radix
 
+    cls: defining_class
+
 Return Decimal(10).
 
 This is the radix (base) in which the Decimal class does
 all its arithmetic. Included for compatibility with the specification.
 [clinic start generated code]*/
 
 static PyObject *
-_decimal_Decimal_radix_impl(PyObject *self)
-/*[clinic end generated code: output=6b1db4c3fcdb5ee1 input=18b72393549ca8fd]*/
+_decimal_Decimal_radix_impl(PyObject *self, PyTypeObject *cls)
+/*[clinic end generated code: output=40a3bc7ec3d99228 input=b0d4cb9f870bbac1]*/
 {
-    decimal_state *state = get_module_state_by_def(Py_TYPE(self));
+    decimal_state *state = PyType_GetModuleState(cls);
     return _dec_mpd_radix(state);
 }
 
 /*[clinic input]
 _decimal.Decimal.copy_abs
 
+    cls: defining_class
+
 Return the absolute value of the argument.
 
 This operation is unaffected by context and is quiet: no flags are
 changed and no rounding is performed.
 [clinic start generated code]*/
 
 static PyObject *
-_decimal_Decimal_copy_abs_impl(PyObject *self)
-/*[clinic end generated code: output=fff53742cca94d70 input=a263c2e71d421f1b]*/
+_decimal_Decimal_copy_abs_impl(PyObject *self, PyTypeObject *cls)
+/*[clinic end generated code: output=081cb7fb4230676e input=676d7c62b1795512]*/
 {
     PyObject *result;
     uint32_t status = 0;
+    decimal_state *state = PyType_GetModuleState(cls);
 
-    decimal_state *state = get_module_state_by_def(Py_TYPE(self));
     if ((result = dec_alloc(state)) == NULL) {
         return NULL;
     }
@@ -5147,7 +5197,7 @@ _decimal_Decimal_copy_abs_impl(PyObject *self)
 }
 
 /*[clinic input]
-_decimal.Decimal.copy_negate
+_decimal.Decimal.copy_negate = _decimal.Decimal.copy_abs
 
 Return the negation of the argument.
 
@@ -5156,13 +5206,13 @@ changed and no rounding is performed.
 [clinic start generated code]*/
 
 static PyObject *
-_decimal_Decimal_copy_negate_impl(PyObject *self)
-/*[clinic end generated code: output=8551bc26dbc5d01d input=13d47ed3a5d228b1]*/
+_decimal_Decimal_copy_negate_impl(PyObject *self, PyTypeObject *cls)
+/*[clinic end generated code: output=04fed82c17d4e28b input=23f41ee8899f3891]*/
 {
     PyObject *result;
     uint32_t status = 0;
+    decimal_state *state = PyType_GetModuleState(cls);
 
-    decimal_state *state = get_module_state_by_def(Py_TYPE(self));
     if ((result = dec_alloc(state)) == NULL) {
         return NULL;
     }
@@ -7336,8 +7386,8 @@ static PyMethodDef context_methods [] =
 #endif
 
   /* Miscellaneous */
-  { "__copy__", context_copy, METH_NOARGS, NULL },
-  { "__reduce__", context_reduce, METH_NOARGS, NULL },
+  _DECIMAL_CONTEXT___COPY___METHODDEF
+  _DECIMAL_CONTEXT___REDUCE___METHODDEF
   _DECIMAL_CONTEXT_COPY_METHODDEF
   _DECIMAL_CONTEXT_CREATE_DECIMAL_METHODDEF
   _DECIMAL_CONTEXT_CREATE_DECIMAL_FROM_FLOAT_METHODDEF