Changeset 391 for python/trunk/Modules/cjkcodecs/alg_jisx0201.h

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Modules/cjkcodecs/alg_jisx0201.h (modified) (1 diff)

python/trunk/Modules/cjkcodecs/alg_jisx0201.h

@@ -1 @@
-#define JISX0201_R_ENCODE(c, assi)                      \
-        if ((c) < 0x80 && (c) != 0x5c && (c) != 0x7e)   \
-                (assi) = (c);                           \
-        else if ((c) == 0x00a5) (assi) = 0x5c;          \
-        else if ((c) == 0x203e) (assi) = 0x7e;
-#define JISX0201_K_ENCODE(c, assi)                      \
-        if ((c) >= 0xff61 && (c) <= 0xff9f)             \
-                (assi) = (c) - 0xfec0;
-#define JISX0201_ENCODE(c, assi)                        \
-        JISX0201_R_ENCODE(c, assi)                      \
-        else JISX0201_K_ENCODE(c, assi)
+#define JISX0201_R_ENCODE(c, assi)                      \
+    if ((c) < 0x80 && (c) != 0x5c && (c) != 0x7e)       \
+        (assi) = (c);                                   \
+    else if ((c) == 0x00a5) (assi) = 0x5c;              \
+    else if ((c) == 0x203e) (assi) = 0x7e;
+#define JISX0201_K_ENCODE(c, assi)                      \
+    if ((c) >= 0xff61 && (c) <= 0xff9f)                 \
+        (assi) = (c) - 0xfec0;
+#define JISX0201_ENCODE(c, assi)                        \
+    JISX0201_R_ENCODE(c, assi)                          \
+    else JISX0201_K_ENCODE(c, assi)
 
-#define JISX0201_R_DECODE(c, assi)                      \
-        if ((c) < 0x5c) (assi) = (c);                   \
-        else if ((c) == 0x5c) (assi) = 0x00a5;          \
-        else if ((c) < 0x7e) (assi) = (c);              \
-        else if ((c) == 0x7e) (assi) = 0x203e;          \
-        else if ((c) == 0x7f) (assi) = 0x7f;
-#define JISX0201_K_DECODE(c, assi)                      \
-        if ((c) >= 0xa1 && (c) <= 0xdf)                 \
-        (assi) = 0xfec0 + (c);
-#define JISX0201_DECODE(c, assi)                        \
-        JISX0201_R_DECODE(c, assi)                      \
-        else JISX0201_K_DECODE(c, assi)
+#define JISX0201_R_DECODE(c, assi)                      \
+    if ((c) < 0x5c) (assi) = (c);                       \
+    else if ((c) == 0x5c) (assi) = 0x00a5;              \
+    else if ((c) < 0x7e) (assi) = (c);                  \
+    else if ((c) == 0x7e) (assi) = 0x203e;              \
+    else if ((c) == 0x7f) (assi) = 0x7f;
+#define JISX0201_K_DECODE(c, assi)                      \
+    if ((c) >= 0xa1 && (c) <= 0xdf)                     \
+    (assi) = 0xfec0 + (c);
+#define JISX0201_DECODE(c, assi)                        \
+    JISX0201_R_DECODE(c, assi)                          \
+    else JISX0201_K_DECODE(c, assi)