tool: Fix some scripts for gperf 3.1

Gperf 3.1 uses size_t instead of long.
k-takata · Apr 3, 2017 · 1364ae3 · 1364ae3
1 parent 7acbee3
commit 1364ae3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tool/convert-jis-props.sh b/tool/convert-jis-props.sh
@@ -3,9 +3,9 @@
 # Convert props.kwd to props.h using GNU gperf.
 #
 # Usage:
-#   ./tool/convert-jis-props enc/jis/props.kwd enc/jis/props.h
+#   ./tool/convert-jis-props.sh enc/jis/props.kwd enc/jis/props.h
 
 JIS_PROPS_OPTIONS='-k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property'
 
 gperf $JIS_PROPS_OPTIONS $1 | \
-    sed 's/(int)(long)&((\([a-zA-Z_0-9 ]*[a-zA-Z_0-9]\) *\*)0)->\([a-zA-Z0-9_]*\),/(char)offsetof(\1, \2),/g' > $2
+    sed 's/(int)(\(long\|size_t\))&((\([a-zA-Z_0-9 ]*[a-zA-Z_0-9]\) *\*)0)->\([a-zA-Z0-9_]*\),/(char)offsetof(\2, \3),/g' > $2
diff --git a/tool/enc-unicode.rb b/tool/enc-unicode.rb
@@ -534,7 +534,7 @@ def write(str)
   IO.popen(%W[diff -DUSE_UNICODE_AGE_PROPERTIES #{fds[1].path} #{fds[0].path}], "r") {|age|
     IO.popen(%W[diff -DUSE_UNICODE_PROPERTIES #{fds[2].path} -], "r", in: age) {|f|
       f.each {|line|
-        line.gsub!(/\(int\)\(long\)&\(\(struct uniname2ctype_pool_t \*\)0\)->uniname2ctype_pool_(str\d+),\s+/,
+        line.gsub!(/\(int\)\((?:long|size_t)\)&\(\(struct uniname2ctype_pool_t \*\)0\)->uniname2ctype_pool_(str\d+),\s+/,
                    'uniname2ctype_offset(\1), ')
         puts line
       }