about summary refs log tree commit diff
path: root/iconvdata/cns11643.h
diff options
context:
space:
mode:
Diffstat (limited to 'iconvdata/cns11643.h')
-rw-r--r--iconvdata/cns11643.h220
1 files changed, 102 insertions, 118 deletions
diff --git a/iconvdata/cns11643.h b/iconvdata/cns11643.h
index f791d4cdb3..ccab8011ce 100644
--- a/iconvdata/cns11643.h
+++ b/iconvdata/cns11643.h
@@ -21,8 +21,8 @@
 #include <stdint.h>
 
 /* Table for CNS 11643, plane 2 to UCS4 conversion.  */
-extern const uint16_t cns11643l2_to_ucs4_tab[];
-extern const uint16_t cns11643l14_to_ucs4_tab[];
+extern const uint16_t __cns11643l2_to_ucs4_tab[];
+extern const uint16_t __cns11643l14_to_ucs4_tab[];
 
 
 static inline wchar_t
@@ -54,19 +54,19 @@ cns11643_to_ucs4 (const char **s, size_t avail, unsigned char offset)
     {
       if (idx > 0x2196)
 	return UNKNOWN_10646_CHAR;
-      result = cns11643l1_to_ucs4_tab[idx];
+      result = __cns11643l1_to_ucs4_tab[idx];
     }
   else if ((ch - 0x21 - offset) == 2)
     {
       if (idx > 0x1de1)
 	return UNKNOWN_10646_CHAR;
-      result = cns11643l2_to_ucs4_tab[idx];
+      result = __cns11643l2_to_ucs4_tab[idx];
     }
   else if ((ch - 0x21 - offset) == 0xe)
     {
       if (idx > 0x19bd)
 	return UNKNOWN_10646_CHAR;
-      result = cns11643l14_to_ucs4_tab[idx];
+      result = __cns11643l14_to_ucs4_tab[idx];
     }
   else
     return UNKNOWN_10646_CHAR;
@@ -81,21 +81,21 @@ cns11643_to_ucs4 (const char **s, size_t avail, unsigned char offset)
 
 
 /* Tables for the UCS4 -> CNS conversion.  */
-extern const char cns11643l1_from_ucs4_tab1[][2];
-extern const char cns11643l1_from_ucs4_tab2[][2];
-extern const char cns11643l1_from_ucs4_tab3[][2];
-extern const char cns11643l1_from_ucs4_tab4[][2];
-extern const char cns11643l1_from_ucs4_tab5[][2];
-extern const char cns11643l1_from_ucs4_tab6[][2];
-extern const char cns11643l1_from_ucs4_tab7[][2];
-extern const char cns11643l1_from_ucs4_tab8[][2];
-extern const char cns11643l1_from_ucs4_tab9[][2];
-extern const char cns11643l1_from_ucs4_tab10[][2];
-extern const char cns11643l1_from_ucs4_tab11[][2];
-extern const char cns11643l1_from_ucs4_tab12[][2];
-extern const char cns11643l1_from_ucs4_tab13[][2];
-extern const char cns11643l1_from_ucs4_tab14[][2];
-extern const char cns11643_from_ucs4_tab[][3];
+extern const char __cns11643l1_from_ucs4_tab1[][2];
+extern const char __cns11643l1_from_ucs4_tab2[][2];
+extern const char __cns11643l1_from_ucs4_tab3[][2];
+extern const char __cns11643l1_from_ucs4_tab4[][2];
+extern const char __cns11643l1_from_ucs4_tab5[][2];
+extern const char __cns11643l1_from_ucs4_tab6[][2];
+extern const char __cns11643l1_from_ucs4_tab7[][2];
+extern const char __cns11643l1_from_ucs4_tab8[][2];
+extern const char __cns11643l1_from_ucs4_tab9[][2];
+extern const char __cns11643l1_from_ucs4_tab10[][2];
+extern const char __cns11643l1_from_ucs4_tab11[][2];
+extern const char __cns11643l1_from_ucs4_tab12[][2];
+extern const char __cns11643l1_from_ucs4_tab13[][2];
+extern const char __cns11643l1_from_ucs4_tab14[][2];
+extern const char __cns11643_from_ucs4_tab[][3];
 
 
 static inline size_t
@@ -103,120 +103,104 @@ ucs4_to_cns11643 (wchar_t wch, char *s, size_t avail)
 {
   unsigned int ch = (unsigned int) wch;
   char buf[2];
-  const char *cp = NULL;
+  const char *cp = buf;
   int needed = 2;
 
-  if (ch < 0xa7)
-    cp = "";
-  else if (ch < 0xf7)
-    cp = cns11643l1_from_ucs4_tab1[ch - 0xa7];
-  else if (ch < 0x2c7)
-    cp = "";
-  else if (ch <= 0x2d9)
-    cp = cns11643l1_from_ucs4_tab2[ch - 0x2c7];
-  else if (ch < 0x391)
-    cp = "";
-  else if (ch <= 0x3c9)
-    cp = cns11643l1_from_ucs4_tab3[ch - 0x391];
-  else if (ch < 0x2013)
-    cp = "";
-  else if (ch <= 0x203e)
-    cp = cns11643l1_from_ucs4_tab4[ch - 0x2013];
-  else if (ch == 0x2103)
-    cp = "\x22\x6a";
-  else if (ch == 0x2105)
-    cp = "\x22\x22";
-  else if (ch == 0x2109)
-    cp = "\x22\x6b";
-  else if (ch < 0x2160)
-    cp = "";
-  else if (ch <= 0x2169)
+  switch (ch)
     {
+    case 0xa7 ... 0xf7:
+      cp = __cns11643l1_from_ucs4_tab1[ch - 0xa7];
+      break;
+    case 0x2c7 ... 0x2d9:
+      cp = __cns11643l1_from_ucs4_tab2[ch - 0x2c7];
+      break;
+    case 0x391 ... 0x3c9:
+      cp = __cns11643l1_from_ucs4_tab3[ch - 0x391];
+      break;
+    case 0x2013 ... 0x203e:
+      cp = __cns11643l1_from_ucs4_tab4[ch - 0x2013];
+      break;
+    case 0x2103:
+      cp = "\x22\x6a";
+      break;
+    case 0x2105:
+      cp = "\x22\x22";
+      break;
+    case 0x2109:
+      cp = "\x22\x6b";
+      break;
+    case 0x2160 ...0x2169:
       buf[0] = '\x24';
       buf[1] = '\x2b' + (ch - 0x2160);
-      cp = buf;
-    }
-  else if (ch < 0x2170)
-    cp = "";
-  else if (ch <= 0x2179)
-    {
+      break;
+    case 0x2170 ... 0x2179:
       buf[0] = '\x26';
       buf[1] = '\x35' + (ch - 0x2170);
-      cp = buf;
-    }
-  else if (ch < 0x2190)
-    cp = "";
-  else if (ch <= 0x2199)
-    cp = cns11643l1_from_ucs4_tab5[ch - 0x2190];
-  else if (ch < 0x2215)
-    cp = "";
-  else if (ch <= 0x2267)
-    cp = cns11643l1_from_ucs4_tab6[ch - 0x2215];
-  else if (ch == 0x22a5)
-    cp = "\x22\x47";
-  else if (ch == 0x22bf)
-    cp = "\x22\x4a";
-  else if (ch < 0x2400)
-    cp = "";
-  else if (ch <= 0x2421)
-    cp = cns11643l1_from_ucs4_tab7[ch - 0x2400];
-  else if (ch < 0x2460)
-    cp = "";
-  else if (ch <= 0x247d)
-    cp = cns11643l1_from_ucs4_tab8[ch - 0x2460];
-  else if (ch < 0x2500)
-    cp = "";
-  else if (ch <= 0x2642)
-    cp = cns11643l1_from_ucs4_tab9[ch - 0x2500];
-  else if (ch < 0x3000)
-    cp = "";
-  else if (ch <= 0x3029)
-    cp = cns11643l1_from_ucs4_tab10[ch - 0x3000];
-  else if (ch == 0x30fb)
-    cp = "\x21\x26";
-  else if (ch < 0x3105)
-    cp = "";
-  else if (ch <= 0x3129)
-    {
+      break;
+    case 0x2190 ... 0x2199:
+      cp = __cns11643l1_from_ucs4_tab5[ch - 0x2190];
+      break;
+    case 0x2215 ... 0x2267:
+      cp = __cns11643l1_from_ucs4_tab6[ch - 0x2215];
+      break;
+    case 0x22a5:
+      cp = "\x22\x47";
+      break;
+    case 0x22bf:
+      cp = "\x22\x4a";
+      break;
+    case 0x2400 ... 0x2421:
+      cp = __cns11643l1_from_ucs4_tab7[ch - 0x2400];
+      break;
+    case 0x2460 ... 0x247d:
+      cp = __cns11643l1_from_ucs4_tab8[ch - 0x2460];
+      break;
+    case 0x2500 ... 0x2642:
+      cp = __cns11643l1_from_ucs4_tab9[ch - 0x2500];
+    case 0x3000 ... 0x3029:
+      cp = __cns11643l1_from_ucs4_tab10[ch - 0x3000];
+      break;
+    case 0x30fb:
+      cp = "\x21\x26";
+      break;
+    case 0x3105 ... 0x3129:
       buf[0] = '\x25';
       buf[1] = '\x26' + (ch - 0x3105);
-      cp = buf;
-    }
-  else if (ch == 0x32a3)
-    cp = "\x22\x21";
-  else if (ch < 0x338e)
-    cp = "";
-  else if (ch <= 0x33d5)
-    cp = cns11643l1_from_ucs4_tab11[ch - 0x338e];
-  else if (ch < 0x4e00)
-    cp = "";
-  else if (ch <= 0x9f9c)
-    {
-      cp = cns11643l1_from_ucs4_tab12[ch - 0x4e00];
+      break;
+    case 0x32a3:
+      cp = "\x22\x21";
+      break;
+    case 0x338e ... 0x33d5:
+      cp = __cns11643l1_from_ucs4_tab11[ch - 0x338e];
+      break;
+    case 0x4e00 ... 0x9f9c:
+      cp = __cns11643l1_from_ucs4_tab12[ch - 0x4e00];
 
       if (cp[0] == '\0')
 	{
 	  /* Let's try the other planes.  */
 	  needed = 3;
-	  cp = cns11643_from_ucs4_tab[ch - 0x4e00];
+	  cp = __cns11643_from_ucs4_tab[ch - 0x4e00];
 	}
+      break;
+    case 0xfe30 ... 0xfe6b:
+      cp = __cns11643l1_from_ucs4_tab13[ch - 0xfe30];
+      break;
+    case 0xff01 ... 0xff5d:
+      cp = __cns11643l1_from_ucs4_tab14[ch - 0xff01];
+      break;
+    case 0xffe0:
+      cp = "\x22\x66";
+      break;
+    case 0xffe1:
+      cp = "\x22\x67";
+      break;
+    case 0xffe5:
+      cp = "\x22\x64";
+      break;
+    default:
+      cp = "";
     }
-  else if (ch < 0xfe30)
-    cp = "";
-  else if (ch <= 0xfe6b)
-    cp = cns11643l1_from_ucs4_tab13[ch - 0xfe30];
-  else if (ch < 0xff01)
-    cp = "";
-  else if (ch <= 0xff5d)
-    cp = cns11643l1_from_ucs4_tab14[ch - 0xff01];
-  else if (ch == 0xffe0)
-    cp = "\x22\x66";
-  else if (ch == 0xffe1)
-    cp = "\x22\x67";
-  else if (ch == 0xffe5)
-    cp = "\x22\x64";
-  else
-    cp = "";
 
   if (cp[0] == '\0')
     return UNKNOWN_10646_CHAR;