Collect AC def's and scope clinic_get_state()

Erlend E. Aasland · Erlend E. Aasland · commit e8b302113dca · 2021-01-04T21:54:24.000+01:00
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
@@ -36,13 +36,18 @@ _multibyte_codec_find_state_by_type(PyTypeObject *type)
     assert(module != NULL);
     return _multibytecodec_get_state(module);
 }
-#define clinic_get_state() _multibyte_codec_find_state_by_type(type)
 
+#define clinic_get_state() _multibyte_codec_find_state_by_type(type)
 /*[clinic input]
 module _multibytecodec
 class _multibytecodec.MultibyteCodec "MultibyteCodecObject *" "clinic_get_state()->multibytecodec_type"
+class _multibytecodec.MultibyteIncrementalEncoder "MultibyteIncrementalEncoderObject *" "clinic_get_state()->encoder_type"
+class _multibytecodec.MultibyteIncrementalDecoder "MultibyteIncrementalDecoderObject *" "clinic_get_state()->decoder_type"
+class _multibytecodec.MultibyteStreamReader "MultibyteStreamReaderObject *" "clinic_get_state()->reader_type"
+class _multibytecodec.MultibyteStreamWriter "MultibyteStreamWriterObject *" "clinic_get_state()->writer_type"
 [clinic start generated code]*/
-/*[clinic end generated code: output=da39a3ee5e6b4b0d input=10de8b4f74379258]*/
+/*[clinic end generated code: output=da39a3ee5e6b4b0d input=305a76dfdd24b99c]*/
+#undef clinic_get_state
 
 typedef struct {
     PyObject            *inobj;
@@ -880,11 +885,6 @@ decoder_feed_buffer(MultibyteStatefulDecoderContext *ctx,
 }
 
 
-/*[clinic input]
- class _multibytecodec.MultibyteIncrementalEncoder "MultibyteIncrementalEncoderObject *" "clinic_get_state()->encoder_type"
-[clinic start generated code]*/
-/*[clinic end generated code: output=da39a3ee5e6b4b0d input=fce269303b813c06]*/
-
 /*[clinic input]
 _multibytecodec.MultibyteIncrementalEncoder.encode
 
@@ -1106,11 +1106,6 @@ static PyType_Spec encoder_spec = {
 };
 
 
-/*[clinic input]
- class _multibytecodec.MultibyteIncrementalDecoder "MultibyteIncrementalDecoderObject *" "clinic_get_state()->decoder_type"
-[clinic start generated code]*/
-/*[clinic end generated code: output=da39a3ee5e6b4b0d input=a237fd1042be76c8]*/
-
 /*[clinic input]
 _multibytecodec.MultibyteIncrementalDecoder.decode
 
@@ -1383,12 +1378,6 @@ static PyType_Spec decoder_spec = {
     .slots = decoder_slots,
 };
 
-
-/*[clinic input]
- class _multibytecodec.MultibyteStreamReader "MultibyteStreamReaderObject *" "clinic_get_state()->reader_type"
-[clinic start generated code]*/
-/*[clinic end generated code: output=da39a3ee5e6b4b0d input=8d4b82105d531fce]*/
-
 static PyObject *
 mbstreamreader_iread(MultibyteStreamReaderObject *self,
                      const char *method, Py_ssize_t sizehint)
@@ -1710,12 +1699,6 @@ static PyType_Spec reader_spec = {
     .slots = reader_slots,
 };
 
-
-/*[clinic input]
- class _multibytecodec.MultibyteStreamWriter "MultibyteStreamWriterObject *" "clinic_get_state()->writer_type"
-[clinic start generated code]*/
-/*[clinic end generated code: output=da39a3ee5e6b4b0d input=2f5c85659ad82e8c]*/
-
 static int
 mbstreamwriter_iwrite(MultibyteStreamWriterObject *self,
                       PyObject *unistr)
