commit bd97ac35f7cab6229243e2c93b6fa6eaf7f0cc19
author Victor Stinner <victor.stinner@gmail.com> Mon Oct 28 23:54:13 2013 +0100
committer Victor Stinner <victor.stinner@gmail.com> Mon Oct 28 23:54:13 2013 +0100
tree 65a872a6465d226a833445ce4a5f46ea6d363949
parent 0a6e2c59d362659001adfb232537f9af5fdb256c

CJK codecs: use less magic and more readable macros, write explicit if

Modules/cjkcodecs/_codecs_jp.c

diff --git a/Modules/cjkcodecs/_codecs_jp.c b/Modules/cjkcodecs/_codecs_jp.c
index a08aa15..993096e 100644
--- a/Modules/cjkcodecs/_codecs_jp.c
+++ b/Modules/cjkcodecs/_codecs_jp.c
@@ -49,11 +49,11 @@
             return 1;
         REQUIRE_OUTBUF(2)
 
-        TRYMAP_ENC(cp932ext, code, c) {
+        if (TRYMAP_ENC(cp932ext, code, c)) {
             OUTBYTE1(code >> 8)
             OUTBYTE2(code & 0xff)
         }
-        else TRYMAP_ENC(jisxcommon, code, c) {
+        else if (TRYMAP_ENC(jisxcommon, code, c)) {
             if (code & 0x8000) /* MSB set: JIS X 0212 */
                 return 1;
 
@@ -165,7 +165,7 @@
 
         if (c <= 0xFFFF) {
             EMULATE_JISX0213_2000_ENCODE_BMP(code, c)
-            else TRYMAP_ENC(jisx0213_bmp, code, c) {
+            else if (TRYMAP_ENC(jisx0213_bmp, code, c)) {
                 if (code == MULTIC) {
                     if (inlen - *inpos < 2) {
                         if (flags & MBENC_FLUSH) {
@@ -197,7 +197,7 @@
                     }
                 }
             }
-            else TRYMAP_ENC(jisxcommon, code, c);
+            else if (TRYMAP_ENC(jisxcommon, code, c));
             else if (c >= 0xff61 && c <= 0xff9f) {
                 /* JIS X 0201 half-width katakana */
                 WRITEBYTE2(0x8e, c - 0xfec0)
@@ -215,7 +215,7 @@
         }
         else if (c >> 16 == EMPBASE >> 16) {
             EMULATE_JISX0213_2000_ENCODE_EMP(code, c)
-            else TRYMAP_ENC(jisx0213_emp, code, c & 0xffff);
+            else if (TRYMAP_ENC(jisx0213_emp, code, c & 0xffff));
             else return insize;
         }
         else
@@ -334,7 +334,7 @@
         if (c > 0xFFFF)
             return 1;
 
-        TRYMAP_ENC(jisxcommon, code, c);
+        if (TRYMAP_ENC(jisxcommon, code, c));
         else if (c >= 0xff61 && c <= 0xff9f) {
             /* JIS X 0201 half-width katakana */
             WRITEBYTE2(0x8e, c - 0xfec0)
@@ -469,7 +469,7 @@
         REQUIRE_OUTBUF(2)
 
         if (code == NOCHAR) {
-            TRYMAP_ENC(jisxcommon, code, c);
+            if (TRYMAP_ENC(jisxcommon, code, c));
 #ifndef STRICT_BUILD
             else if (c == 0xff3c)
                 code = 0x2140; /* FULL-WIDTH REVERSE SOLIDUS */
@@ -570,7 +570,7 @@
         if (code == NOCHAR) {
             if (c <= 0xffff) {
                 EMULATE_JISX0213_2000_ENCODE_BMP(code, c)
-                else TRYMAP_ENC(jisx0213_bmp, code, c) {
+                else if (TRYMAP_ENC(jisx0213_bmp, code, c)) {
                     if (code == MULTIC) {
                         if (inlen - *inpos < 2) {
                             if (flags & MBENC_FLUSH) {
@@ -603,7 +603,7 @@
                         }
                     }
                 }
-                else TRYMAP_ENC(jisxcommon, code, c) {
+                else if (TRYMAP_ENC(jisxcommon, code, c)) {
                     /* abandon JIS X 0212 codes */
                     if (code & 0x8000)
                         return 1;
@@ -612,7 +612,7 @@
             }
             else if (c >> 16 == EMPBASE >> 16) {
                 EMULATE_JISX0213_2000_ENCODE_EMP(code, c)
-                else TRYMAP_ENC(jisx0213_emp, code, c&0xffff);
+                else if (TRYMAP_ENC(jisx0213_emp, code, c&0xffff));
                 else return insize;
             }
             else