don't output if (0 == 0) statements (instead of PR #158)

diff --git a/src/gperf_fold_key_conv.py b/src/gperf_fold_key_conv.py
index f45318677269691795d262f1a2ebd545831c088f..c633100df17345406ee6ab6cb629f5707ec1e0a3 100755 (executable)
--- a/src/gperf_fold_key_conv.py
+++ b/src/gperf_fold_key_conv.py
@@ -12,7 +12,7 @@ REG_STR_AT = re.compile('str\[(\d+)\]')
 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+size_t\s+len\)')
 REG_ENTRY = re.compile('\{".*?",\s*(-?\d+)\s*\}')
-REG_IF_LEN = re.compile('if\s*\(\s*len\s*<=\s*MAX_WORD_LENGTH.+')
+REG_IF_LEN = re.compile('\s*if\s*\(\s*len\s*<=\s*MAX_WORD_LENGTH.+')
 REG_GET_HASH = re.compile('(?:register\s+)?(?:unsigned\s+)?int\s+key\s*=\s*hash\s*\(str,\s*len\);')
 REG_GET_CODE = re.compile('(?:register\s+)?const\s+char\s*\*\s*s\s*=\s*wordlist\[key\]\.name;')
 REG_CODE_CHECK = re.compile('if\s*\(\*str\s*==\s*\*s\s*&&\s*!strncmp.+\)')
@@ -34,7 +34,7 @@ def parse_line(s, key_len):
     if r != s: return r
     r = re.sub(REG_ENTRY, '\\1', s)
     if r != s: return r
-    r = re.sub(REG_IF_LEN, 'if (0 == 0)', s)
+    r = re.sub(REG_IF_LEN, '', s)
     if r != s: return r
     r = re.sub(REG_GET_HASH, 'int key = hash(codes);', s)
     if r != s: return r

diff --git a/src/gperf_unfold_key_conv.py b/src/gperf_unfold_key_conv.py
index 3cf4836ffa6e571a290e681a984e6a02d882b560..d999d4e97cc97f42a76f82e5b87145b9c23e9836 100755 (executable)
--- a/src/gperf_unfold_key_conv.py
+++ b/src/gperf_unfold_key_conv.py
@@ -12,7 +12,7 @@ REG_STR_AT = re.compile('str\[(\d+)\]')
 REG_UNFOLD_KEY = re.compile('onigenc_unicode_unfold_key\s*\(register\s+const\s+char\s*\*\s*str,\s*register\s+size_t\s+len\)')
 REG_ENTRY = re.compile('\{".+?",\s*/\*(.+?)\*/\s*(-?\d+),\s*(\d)\}')
 REG_EMPTY_ENTRY = re.compile('\{"",\s*(-?\d+),\s*(\d)\}')
-REG_IF_LEN = re.compile('if\s*\(\s*len\s*<=\s*MAX_WORD_LENGTH.+')
+REG_IF_LEN = re.compile('\s*if\s*\(\s*len\s*<=\s*MAX_WORD_LENGTH.+')
 REG_GET_HASH = re.compile('(?:register\s+)?(?:unsigned\s+)?int\s+key\s*=\s*hash\s*\(str,\s*len\);')
 REG_GET_CODE = re.compile('(?:register\s+)?const\s+char\s*\*\s*s\s*=\s*wordlist\[key\]\.name;')
 REG_CODE_CHECK = re.compile('if\s*\(\*str\s*==\s*\*s\s*&&\s*!strncmp.+\)')
@@ -32,7 +32,7 @@ def parse_line(s):
     if r != s: return r
     r = re.sub(REG_EMPTY_ENTRY, '{0xffffffff, \\1, \\2}', s)
     if r != s: return r
-    r = re.sub(REG_IF_LEN, 'if (0 == 0)', s)
+    r = re.sub(REG_IF_LEN, '', s)
     if r != s: return r
     r = re.sub(REG_GET_HASH, 'int key = hash(&code);', s)
     if r != s: return r