Skip to content

Commit 146a2ed

Browse files
vstinnervstinner
committed
CJK codecs: add newlines for readability
1 parent bd97ac3 commit 146a2ed

File tree

7 files changed

+188
-91
lines changed

7 files changed

+188
-91
lines changed

‎Modules/cjkcodecs/_codecs_cn.c‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,13 @@
3333
OUTCHAR(decoded);
3434

3535
#define GBK_ENCODE(code, assi) \
36-
if ((code) == 0x2014) (assi) = 0xa1aa; \
37-
else if ((code) == 0x2015) (assi) = 0xa844; \
38-
else if ((code) == 0x00b7) (assi) = 0xa1a4; \
39-
else if ((code) != 0x30fb && TRYMAP_ENC(gbcommon, assi, code));
36+
if ((code) == 0x2014) \
37+
(assi) = 0xa1aa; \
38+
else if ((code) == 0x2015) \
39+
(assi) = 0xa844; \
40+
else if ((code) == 0x00b7) \
41+
(assi) = 0xa1a4; \
42+
else if ((code) != 0x30fb && TRYMAP_ENC(gbcommon, assi, code))
4043

4144
/*
4245
* GB2312 codec
@@ -58,8 +61,10 @@ ENCODER(gb2312)
5861
return 1;
5962

6063
REQUIRE_OUTBUF(2)
61-
if (TRYMAP_ENC(gbcommon, code, c));
62-
else return 1;
64+
if (TRYMAP_ENC(gbcommon, code, c))
65+
;
66+
else
67+
return 1;
6368

6469
if (code & 0x8000) /* MSB set: GBK */
6570
return 1;
@@ -89,7 +94,8 @@ DECODER(gb2312)
8994
OUTCHAR(decoded);
9095
NEXT_IN(2);
9196
}
92-
else return 1;
97+
else
98+
return 1;
9399
}
94100

95101
return 0;
@@ -118,7 +124,9 @@ ENCODER(gbk)
118124
REQUIRE_OUTBUF(2)
119125

120126
GBK_ENCODE(c, code)
121-
else return 1;
127+
;
128+
else
129+
return 1;
122130

123131
OUTBYTE1((code >> 8) | 0x80)
124132
if (code & 0x8000)
@@ -146,7 +154,8 @@ DECODER(gbk)
146154
REQUIRE_INBUF(2)
147155

148156
GBK_DECODE(c, INBYTE2, writer)
149-
else return 1;
157+
else
158+
return 1;
150159

151160
NEXT_IN(2);
152161
}
@@ -192,7 +201,9 @@ ENCODER(gb18030)
192201
REQUIRE_OUTBUF(2)
193202

194203
GBK_ENCODE(c, code)
195-
else if (TRYMAP_ENC(gb18030ext, code, c));
204+
;
205+
else if (TRYMAP_ENC(gb18030ext, code, c))
206+
;
196207
else {
197208
const struct _gb18030_to_unibmp_ranges *utrrange;
198209

@@ -292,7 +303,8 @@ DECODER(gb18030)
292303
GBK_DECODE(c, c2, writer)
293304
else if (TRYMAP_DEC(gb18030ext, decoded, c, c2))
294305
OUTCHAR(decoded);
295-
else return 1;
306+
else
307+
return 1;
296308

297309
NEXT_IN(2);
298310
}
@@ -343,8 +355,10 @@ ENCODER(hz)
343355
if (c > 0xFFFF)
344356
return 1;
345357

346-
if (TRYMAP_ENC(gbcommon, code, c));
347-
else return 1;
358+
if (TRYMAP_ENC(gbcommon, code, c))
359+
;
360+
else
361+
return 1;
348362

349363
if (code & 0x8000) /* MSB set: GBK */
350364
return 1;

‎Modules/cjkcodecs/_codecs_hk.c‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,18 @@ ENCODER(big5hkscs)
8181
}
8282
}
8383
}
84-
else if (TRYMAP_ENC(big5, code, c));
85-
else return 1;
84+
else if (TRYMAP_ENC(big5, code, c))
85+
;
86+
else
87+
return 1;
8688
}
8789
else if (c < 0x20000)
8890
return insize;
8991
else if (c < 0x30000) {
90-
if (TRYMAP_ENC(big5hkscs_nonbmp, code, c & 0xffff));
91-
else return insize;
92+
if (TRYMAP_ENC(big5hkscs_nonbmp, code, c & 0xffff))
93+
;
94+
else
95+
return insize;
9296
}
9397
else
9498
return insize;

‎Modules/cjkcodecs/_codecs_iso2022.c‎

Lines changed: 56 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -318,21 +318,27 @@ iso2022processesc(const void *config, MultibyteCodec_State *state,
318318
}
319319
else {
320320
charset = INBYTE3;
321-
if (INBYTE2 == '(') designation = 0;
322-
else if (INBYTE2 == ')') designation = 1;
321+
if (INBYTE2 == '(')
322+
designation = 0;
323+
else if (INBYTE2 == ')')
324+
designation = 1;
323325
else if (CONFIG_ISSET(USE_G2) && INBYTE2 == '.')
324326
designation = 2;
325-
else return 3;
327+
else
328+
return 3;
326329
}
327330
break;
328331
case 4:
329332
if (INBYTE2 != '$')
330333
return 4;
331334

332335
charset = INBYTE4 | CHARSET_DBCS;
333-
if (INBYTE3 == '(') designation = 0;
334-
else if (INBYTE3 == ')') designation = 1;
335-
else return 4;
336+
if (INBYTE3 == '(')
337+
designation = 0;
338+
else if (INBYTE3 == ')')
339+
designation = 1;
340+
else
341+
return 4;
336342
break;
337343
case 6: /* designation with prefix */
338344
if (CONFIG_ISSET(USE_JISX0208_EXT) &&
@@ -365,16 +371,20 @@ iso2022processesc(const void *config, MultibyteCodec_State *state,
365371
return 0;
366372
}
367373

368-
#define ISO8859_7_DECODE(c, writer) \
369-
if ((c) < 0xa0) OUTCHAR(c); \
370-
else if ((c) < 0xc0 && (0x288f3bc9L & (1L << ((c)-0xa0)))) \
371-
OUTCHAR(c); \
372-
else if ((c) >= 0xb4 && (c) <= 0xfe && ((c) >= 0xd4 || \
373-
(0xbffffd77L & (1L << ((c)-0xb4))))) \
374-
OUTCHAR(0x02d0 + (c)); \
375-
else if ((c) == 0xa1) OUTCHAR(0x2018); \
376-
else if ((c) == 0xa2) OUTCHAR(0x2019); \
377-
else if ((c) == 0xaf) OUTCHAR(0x2015);
374+
#define ISO8859_7_DECODE(c, writer) \
375+
if ((c) < 0xa0) \
376+
OUTCHAR(c); \
377+
else if ((c) < 0xc0 && (0x288f3bc9L & (1L << ((c)-0xa0)))) \
378+
OUTCHAR(c); \
379+
else if ((c) >= 0xb4 && (c) <= 0xfe && ((c) >= 0xd4 || \
380+
(0xbffffd77L & (1L << ((c)-0xb4))))) \
381+
OUTCHAR(0x02d0 + (c)); \
382+
else if ((c) == 0xa1) \
383+
OUTCHAR(0x2018); \
384+
else if ((c) == 0xa2) \
385+
OUTCHAR(0x2019); \
386+
else if ((c) == 0xaf) \
387+
OUTCHAR(0x2015);
378388

379389
static Py_ssize_t
380390
iso2022processg2(const void *config, MultibyteCodec_State *state,
@@ -391,11 +401,14 @@ iso2022processg2(const void *config, MultibyteCodec_State *state,
391401
}
392402
else if (STATE_G2 == CHARSET_ISO8859_7) {
393403
ISO8859_7_DECODE(INBYTE3 ^ 0x80, writer)
394-
else return 3;
404+
else
405+
return 3;
395406
}
396407
else if (STATE_G2 == CHARSET_ASCII) {
397-
if (INBYTE3 & 0x80) return 3;
398-
else OUTCHAR(INBYTE3);
408+
if (INBYTE3 & 0x80)
409+
return 3;
410+
else
411+
OUTCHAR(INBYTE3);
399412
}
400413
else
401414
return MBERR_INTERNAL;
@@ -698,11 +711,14 @@ jisx0213_2000_1_decoder(const unsigned char *data)
698711
EMULATE_JISX0213_2000_DECODE_PLANE1(u, data[0], data[1])
699712
else if (data[0] == 0x21 && data[1] == 0x40) /* F/W REVERSE SOLIDUS */
700713
return 0xff3c;
701-
else if (TRYMAP_DEC(jisx0208, u, data[0], data[1]));
702-
else if (TRYMAP_DEC(jisx0213_1_bmp, u, data[0], data[1]));
714+
else if (TRYMAP_DEC(jisx0208, u, data[0], data[1]))
715+
;
716+
else if (TRYMAP_DEC(jisx0213_1_bmp, u, data[0], data[1]))
717+
;
703718
else if (TRYMAP_DEC(jisx0213_1_emp, u, data[0], data[1]))
704719
u |= 0x20000;
705-
else if (TRYMAP_DEC(jisx0213_pair, u, data[0], data[1]));
720+
else if (TRYMAP_DEC(jisx0213_pair, u, data[0], data[1]))
721+
;
706722
else
707723
return MAP_UNMAPPABLE;
708724
return u;
@@ -713,7 +729,8 @@ jisx0213_2000_2_decoder(const unsigned char *data)
713729
{
714730
Py_UCS4 u;
715731
EMULATE_JISX0213_2000_DECODE_PLANE2_CHAR(u, data[0], data[1])
716-
if (TRYMAP_DEC(jisx0213_2_bmp, u, data[0], data[1]));
732+
if (TRYMAP_DEC(jisx0213_2_bmp, u, data[0], data[1]))
733+
;
717734
else if (TRYMAP_DEC(jisx0213_2_emp, u, data[0], data[1]))
718735
u |= 0x20000;
719736
else
@@ -728,11 +745,14 @@ jisx0213_2004_1_decoder(const unsigned char *data)
728745
Py_UCS4 u;
729746
if (data[0] == 0x21 && data[1] == 0x40) /* F/W REVERSE SOLIDUS */
730747
return 0xff3c;
731-
else if (TRYMAP_DEC(jisx0208, u, data[0], data[1]));
732-
else if (TRYMAP_DEC(jisx0213_1_bmp, u, data[0], data[1]));
748+
else if (TRYMAP_DEC(jisx0208, u, data[0], data[1]))
749+
;
750+
else if (TRYMAP_DEC(jisx0213_1_bmp, u, data[0], data[1]))
751+
;
733752
else if (TRYMAP_DEC(jisx0213_1_emp, u, data[0], data[1]))
734753
u |= 0x20000;
735-
else if (TRYMAP_DEC(jisx0213_pair, u, data[0], data[1]));
754+
else if (TRYMAP_DEC(jisx0213_pair, u, data[0], data[1]))
755+
;
736756
else
737757
return MAP_UNMAPPABLE;
738758
return u;
@@ -742,7 +762,8 @@ static Py_UCS4
742762
jisx0213_2004_2_decoder(const unsigned char *data)
743763
{
744764
Py_UCS4 u;
745-
if (TRYMAP_DEC(jisx0213_2_bmp, u, data[0], data[1]));
765+
if (TRYMAP_DEC(jisx0213_2_bmp, u, data[0], data[1]))
766+
;
746767
else if (TRYMAP_DEC(jisx0213_2_emp, u, data[0], data[1]))
747768
u |= 0x20000;
748769
else
@@ -902,7 +923,8 @@ jisx0201_r_decoder(const unsigned char *data)
902923
{
903924
Py_UCS4 u;
904925
JISX0201_R_DECODE_CHAR(*data, u)
905-
else return MAP_UNMAPPABLE;
926+
else
927+
return MAP_UNMAPPABLE;
906928
return u;
907929
}
908930

@@ -911,7 +933,8 @@ jisx0201_r_encoder(const Py_UCS4 *data, Py_ssize_t *length)
911933
{
912934
DBCHAR coded;
913935
JISX0201_R_ENCODE(*data, coded)
914-
else return MAP_UNMAPPABLE;
936+
else
937+
return MAP_UNMAPPABLE;
915938
return coded;
916939
}
917940

@@ -920,7 +943,8 @@ jisx0201_k_decoder(const unsigned char *data)
920943
{
921944
Py_UCS4 u;
922945
JISX0201_K_DECODE_CHAR(*data ^ 0x80, u)
923-
else return MAP_UNMAPPABLE;
946+
else
947+
return MAP_UNMAPPABLE;
924948
return u;
925949
}
926950

@@ -929,7 +953,8 @@ jisx0201_k_encoder(const Py_UCS4 *data, Py_ssize_t *length)
929953
{
930954
DBCHAR coded;
931955
JISX0201_K_ENCODE(*data, coded)
932-
else return MAP_UNMAPPABLE;
956+
else
957+
return MAP_UNMAPPABLE;
933958
return coded - 0x80;
934959
}
935960

0 commit comments

Comments
 (0)