Kouhei Sutou
null+****@clear*****
Fri Feb 1 17:19:16 JST 2013
Kouhei Sutou 2013-02-01 17:19:16 +0900 (Fri, 01 Feb 2013) New Revision: cae96115cae61e3260194d63989a82cda40bb008 https://github.com/groonga/groonga/commit/cae96115cae61e3260194d63989a82cda40bb008 Log: ctype -> char type Modified files: include/groonga/nfkc.h lib/nfkc.c lib/nfkc.rb lib/normalizer.c lib/str.c Modified: include/groonga/nfkc.h (+1 -1) =================================================================== --- include/groonga/nfkc.h 2013-02-01 17:17:06 +0900 (2f3bbfc) +++ include/groonga/nfkc.h 2013-02-01 17:19:16 +0900 (3b7e294) @@ -23,7 +23,7 @@ extern "C" { #endif -GRN_API grn_char_type grn_nfkc_ctype(const unsigned char *str); +GRN_API grn_char_type grn_nfkc_char_type(const unsigned char *str); #ifdef __cplusplus } Modified: lib/nfkc.c (+1 -1) =================================================================== --- lib/nfkc.c 2013-02-01 17:17:06 +0900 (ee0af36) +++ lib/nfkc.c 2013-02-01 17:19:16 +0900 (de24bdc) @@ -26,7 +26,7 @@ don't edit this file by hand. it generated automatically by nfkc.rb #ifdef WITH_NFKC grn_char_type -grn_nfkc_ctype(const unsigned char *str) +grn_nfkc_char_type(const unsigned char *str) { switch (str[0]) { case 0x01 : Modified: lib/nfkc.rb (+5 -5) =================================================================== --- lib/nfkc.rb 2013-02-01 17:17:06 +0900 (e1f7f59) +++ lib/nfkc.rb 2013-02-01 17:19:16 +0900 (65e3c49) @@ -81,7 +81,7 @@ def gen_bc(file, hash, level) end end -def generate_blockcode_ctype(file, option) +def generate_blockcode_char_type(file, option) bc = {} open("|./icudump --#{option}").each{|l| src,_,code = l.chomp.split("\t") @@ -352,7 +352,7 @@ don't edit this file by hand. it generated automatically by nfkc.rb #ifdef WITH_NFKC unsigned char -grn_nfkc_ctype(const unsigned char *str) +grn_nfkc_char_type(const unsigned char *str) { % return -1; } @@ -399,11 +399,11 @@ tmps = template.split(/%/) #STDERR.puts('generating block code..') #outf.print(tmps.shift) -#generate_blockcode_ctype(outf, 'bc') +#generate_blockcode_char_type(outf, 'bc') -STDERR.puts('generating ctype code..') +STDERR.puts('generating char type code..') outf.print(tmps.shift) -generate_blockcode_ctype(outf, 'gc') +generate_blockcode_char_type(outf, 'gc') STDERR.puts('generating map1 code..') outf.print(tmps.shift) Modified: lib/normalizer.c (+1 -1) =================================================================== --- lib/normalizer.c 2013-02-01 17:17:06 +0900 (5cda116) +++ lib/normalizer.c 2013-02-01 17:19:16 +0900 (44e96a7) @@ -731,7 +731,7 @@ utf8_normalize(grn_ctx *ctx, grn_string *nstr) d_ = d; d += lp; length++; - if (cp) { *cp++ = grn_nfkc_ctype(p); } + if (cp) { *cp++ = grn_nfkc_char_type(p); } if (ch) { size_t i; if (s_ == s + ls) { Modified: lib/str.c (+1 -1) =================================================================== --- lib/str.c 2013-02-01 17:17:06 +0900 (924c697) +++ lib/str.c 2013-02-01 17:19:16 +0900 (8be6dbe) @@ -519,7 +519,7 @@ normalize_utf8(grn_ctx *ctx, grn_str *nstr) d_ = d; d += lp; length++; - if (cp) { *cp++ = grn_nfkc_ctype(p); } + if (cp) { *cp++ = grn_nfkc_char_type(p); } if (ch) { size_t i; if (s_ == s + ls) { -------------- next part -------------- HTML����������������������������...Download