change gperf wordlist type from int to short int

diff --git a/src/gperf_fold_key_conv.py b/src/gperf_fold_key_conv.py
index 5267aa454a9500991b7923c8ee55bfd4f0289f3c..59c5de9549f51caf7e04328b1a6b68f18155fe0f 100755 (executable)
--- a/src/gperf_fold_key_conv.py
+++ b/src/gperf_fold_key_conv.py
@@ -9,7 +9,7 @@ import re
 REG_LINE_GPERF = re.compile('#line .+gperf"')
 REG_HASH_FUNC = re.compile('hash\s*\(register\s+const\s+char\s*\*\s*str,\s*register\s+unsigned\s+int\s+len\s*\)')
 REG_STR_AT = re.compile('str\[(\d+)\]')
-REG_RETURN_TYPE = re.compile('^const\s+int\s*\*')
+REG_RETURN_TYPE = re.compile('^const\s+short\s+int\s*\*')
 REG_FOLD_KEY = re.compile('unicode_fold(\d)_key\s*\(register\s+const\s+char\s*\*\s*str,\s*register\s+unsigned\s+int\s+len\)')
 REG_ENTRY = re.compile('\{".*?",\s*(-?\d+)\s*\}')
 REG_IF_LEN = re.compile('if\s*\(\s*len\s*<=\s*MAX_WORD_LENGTH.+')

diff --git a/src/make_unicode_fold_data.py b/src/make_unicode_fold_data.py
index f4ad321c55e4cc392f8298a2f0ebf23bfcf18296..64aa3a2d5155a11bb6ad381570ceb5afd525987d 100755 (executable)
--- a/src/make_unicode_fold_data.py
+++ b/src/make_unicode_fold_data.py
@@ -250,8 +250,8 @@ def output_gperf_unfold_key(f):
 %}
 struct ByUnfoldKey {
   OnigCodePoint code;
-  int   index;
-  int   fold_len;
+  short int   index;
+  short int   fold_len;
 };
 %%
 """
@@ -272,7 +272,7 @@ def output_gperf_fold_key(f, key_len):
 #include <string.h>
 #include "regenc.h"
 %}
-int
+short int
 %%
 """
     f.write(head)

diff --git a/src/unicode_fold1_key.c b/src/unicode_fold1_key.c
index 21512118e6511cabfe29462e96afbdf8f67e3936..ffaa661726f40d4a6444ccb0445b5d5417dc3afc 100644 (file)
--- a/src/unicode_fold1_key.c
+++ b/src/unicode_fold1_key.c
@@ -69,7 +69,7 @@ __attribute__ ((__gnu_inline__))
 int
 unicode_fold1_key(OnigCodePoint codes[])
 {
-  static const int wordlist[] =
+  static const short int wordlist[] =
     {
       -1, -1, -1, -1, -1, -1,
 

diff --git a/src/unicode_fold2_key.c b/src/unicode_fold2_key.c
index 07cfa4ec5ec9c1ec929299de3fe0447e64a0ac04..8a45c9d96f708d360e3f8f9d9e2013d31dd23e39 100644 (file)
--- a/src/unicode_fold2_key.c
+++ b/src/unicode_fold2_key.c
@@ -69,7 +69,7 @@ __attribute__ ((__gnu_inline__))
 int
 unicode_fold2_key(OnigCodePoint codes[])
 {
-  static const int wordlist[] =
+  static const short int wordlist[] =
     {
 
       101,

diff --git a/src/unicode_fold3_key.c b/src/unicode_fold3_key.c
index 1b4d9d41b7b3692c1b1fac3844efcd3a65684ebe..deb9d222e6171456ba556b8f4be605f251899b6c 100644 (file)
--- a/src/unicode_fold3_key.c
+++ b/src/unicode_fold3_key.c
@@ -69,7 +69,7 @@ __attribute__ ((__gnu_inline__))
 int
 unicode_fold3_key(OnigCodePoint codes[])
 {
-  static const int wordlist[] =
+  static const short int wordlist[] =
     {
 
       62,