apply gperf_fold_key_conv.py and gperf_unfold_key_conv.py changes

diff --git a/src/unicode_fold1_key.c b/src/unicode_fold1_key.c
index 460a8f21bbd9dae1258e4bfe14fe694963533074..171a0fa4b3ff04f5a5dd40576dbfd128714a5591 100644 (file)
--- a/src/unicode_fold1_key.c
+++ b/src/unicode_fold1_key.c
@@ -1,7 +1,7 @@
 /* This file was converted by gperf_fold_key_conv.py
       from gperf output file. */
 /* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: /usr/local/bin/gperf -n -C -T -c -t -j1 -L ANSI-C -F,-1 -N onigenc_unicode_fold1_key unicode_fold1_key.gperf  */
+/* Command-line: gperf -n -C -T -c -t -j1 -L ANSI-C -F,-1 -N onigenc_unicode_fold1_key unicode_fold1_key.gperf  */
 /* Computed positions: -k'1-3' */
 
 
@@ -2983,13 +2983,17 @@ onigenc_unicode_fold1_key(OnigCodePoint codes[])
       4026
     };
 
-    int key = hash(codes);
-    if (key <= MAX_HASH_VALUE) {
-      int index = wordlist[key];
-      if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds1 + index, 1) == 0) {
-        return index;
-      }
-    }
 
+    {
+      int key = hash(codes);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          int index = wordlist[key];
+
+          if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds1 + index, 1) == 0)
+            return index;
+        }
+    }
   return -1;
 }

diff --git a/src/unicode_fold2_key.c b/src/unicode_fold2_key.c
index 2e134cbbe6e274e7d66371fff4aa293dfa483a94..c39b19da4f00c445dde750fb29501d8fcf398e1c 100644 (file)
--- a/src/unicode_fold2_key.c
+++ b/src/unicode_fold2_key.c
@@ -1,7 +1,7 @@
 /* This file was converted by gperf_fold_key_conv.py
       from gperf output file. */
 /* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: /usr/local/bin/gperf -n -C -T -c -t -j1 -L ANSI-C -F,-1 -N onigenc_unicode_fold2_key unicode_fold2_key.gperf  */
+/* Command-line: gperf -n -C -T -c -t -j1 -L ANSI-C -F,-1 -N onigenc_unicode_fold2_key unicode_fold2_key.gperf  */
 /* Computed positions: -k'3,6' */
 
 
@@ -212,13 +212,16 @@ onigenc_unicode_fold2_key(OnigCodePoint codes[])
     };
 
 
-    int key = hash(codes);
-    if (key <= MAX_HASH_VALUE) {
-      int index = wordlist[key];
-      if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds2 + index, 2) == 0) {
-        return index;
-      }
-    }
+    {
+      int key = hash(codes);
 
+      if (key <= MAX_HASH_VALUE)
+        {
+          int index = wordlist[key];
+
+          if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds2 + index, 2) == 0)
+            return index;
+        }
+    }
   return -1;
 }

diff --git a/src/unicode_fold3_key.c b/src/unicode_fold3_key.c
index 11462dfb06b29b0a4fbefa05eba47bf7609b53cc..295c44747ded904565d19613c1280621e8e1b3ea 100644 (file)
--- a/src/unicode_fold3_key.c
+++ b/src/unicode_fold3_key.c
@@ -1,7 +1,7 @@
 /* This file was converted by gperf_fold_key_conv.py
       from gperf output file. */
 /* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: /usr/local/bin/gperf -n -C -T -c -t -j1 -L ANSI-C -F,-1 -N onigenc_unicode_fold3_key unicode_fold3_key.gperf  */
+/* Command-line: gperf -n -C -T -c -t -j1 -L ANSI-C -F,-1 -N onigenc_unicode_fold3_key unicode_fold3_key.gperf  */
 /* Computed positions: -k'3,6,9' */
 
 
@@ -121,13 +121,17 @@ onigenc_unicode_fold3_key(OnigCodePoint codes[])
       0
     };
 
-    int key = hash(codes);
-    if (key <= MAX_HASH_VALUE) {
-      int index = wordlist[key];
-      if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds3 + index, 3) == 0) {
-        return index;
-      }
-    }
 
+    {
+      int key = hash(codes);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          int index = wordlist[key];
+
+          if (index >= 0 && onig_codes_cmp(codes, OnigUnicodeFolds3 + index, 3) == 0)
+            return index;
+        }
+    }
   return -1;
 }

diff --git a/src/unicode_unfold_key.c b/src/unicode_unfold_key.c
index 50022a787bc3a93b07da7471c70fa14ea36e7433..51a037b3991d17ae3ca7f06623b7fad7f3406bda 100644 (file)
--- a/src/unicode_unfold_key.c
+++ b/src/unicode_unfold_key.c
@@ -1,7 +1,7 @@
 /* This file was converted by gperf_unfold_key_conv.py
       from gperf output file. */
 /* ANSI-C code produced by gperf version 3.1 */
-/* Command-line: /usr/local/bin/gperf -n -C -T -c -t -j1 -L ANSI-C -F,-1,0 -N onigenc_unicode_unfold_key unicode_unfold_key.gperf  */
+/* Command-line: gperf -n -C -T -c -t -j1 -L ANSI-C -F,-1,0 -N onigenc_unicode_unfold_key unicode_unfold_key.gperf  */
 /* Computed positions: -k'1-3' */
 
 
@@ -3288,13 +3288,17 @@ onigenc_unicode_unfold_key(OnigCodePoint code)
       {0x1e907, 4005, 1}
     };
 
-    int key = hash(&code);
-    if (key <= MAX_HASH_VALUE) {
-      OnigCodePoint gcode = wordlist[key].code;
-      if (code == gcode && wordlist[key].index >= 0) {
-        return &wordlist[key];
-      }
-    }
 
+    {
+      int key = hash(&code);
+
+      if (key <= MAX_HASH_VALUE)
+        {
+          OnigCodePoint gcode = wordlist[key].code;
+
+          if (code == gcode && wordlist[key].index >= 0)
+            return &wordlist[key];
+        }
+    }
   return 0;
 }