Kouhei Sutou 2018-11-05 17:13:19 +0900 (Mon, 05 Nov 2018) Revision: e7b27802943ab0e02385a635c4c1a34343a11e81 https://github.com/groonga/groonga/commit/e7b27802943ab0e02385a635c4c1a34343a11e81 Message: Work checks again for v sounds and bu sound Modified files: lib/normalizer.c test/command/suite/normalizers/nfkc100/unify_katakana_bu_sound.expected test/command/suite/normalizers/nfkc100/unify_katakana_bu_sound.test test/command/suite/normalizers/nfkc100/unify_katakana_v_sounds.expected test/command/suite/normalizers/nfkc100/unify_katakana_v_sounds.test Modified: lib/normalizer.c (+7 -2) =================================================================== --- lib/normalizer.c 2018-11-05 16:39:24 +0900 (44972cb94) +++ lib/normalizer.c 2018-11-05 17:13:19 +0900 (9ff2b7306) @@ -1338,7 +1338,11 @@ grn_nfkc_normalize_unify(grn_ctx *ctx, } } - if (!skip) { + if (skip) { + if (unify.c) { + unify.c[0] += data->context.checks[i_byte]; + } + } else { if (unify.d + unified_char_length >= unify.dest_end) { grn_nfkc_normalize_context_expand(ctx, &unify, @@ -1357,10 +1361,11 @@ grn_nfkc_normalize_unify(grn_ctx *ctx, } if (unify.c) { size_t i; - *(unify.c++) = data->context.checks[i_byte]; + *(unify.c++) += data->context.checks[i_byte]; for (i = 1; i < unified_char_length; i++) { *(unify.c++) = 0; } + unify.c[0] = 0; } if (unify.o) { *(unify.o++) = data->context.offsets[i_character]; Modified: test/command/suite/normalizers/nfkc100/unify_katakana_bu_sound.expected (+27 -2) =================================================================== --- test/command/suite/normalizers/nfkc100/unify_katakana_bu_sound.expected 2018-11-05 16:39:24 +0900 (ac3a7f38a) +++ test/command/suite/normalizers/nfkc100/unify_katakana_bu_sound.expected 2018-11-05 17:13:19 +0900 (e3210d38e) @@ -1,4 +1,4 @@ -normalize 'NormalizerNFKC100("unify_katakana_bu_sound", true)' "ヴァヴィヴヴェヴォヴ" WITH_TYPES +normalize 'NormalizerNFKC100("unify_katakana_bu_sound", true, "report_source_offset", true)' "ヴァヴィヴヴェヴォヴ" WITH_CHECKS|WITH_TYPES [ [ 0, @@ -16,7 +16,32 @@ normalize 'NormalizerNFKC100("unify_katakana_bu_sound", true)' "ヴァヴィ "katakana" ], "checks": [ - + 3, + 0, + 0, + 6, + 0, + 0, + 6, + 0, + 0, + 3, + 0, + 0, + 6, + 0, + 0, + 6, + 0, + 0 + ], + "offsets": [ + 0, + 6, + 12, + 15, + 21, + 27 ] } ] Modified: test/command/suite/normalizers/nfkc100/unify_katakana_bu_sound.test (+3 -2) =================================================================== --- test/command/suite/normalizers/nfkc100/unify_katakana_bu_sound.test 2018-11-05 16:39:24 +0900 (dcab4ee28) +++ test/command/suite/normalizers/nfkc100/unify_katakana_bu_sound.test 2018-11-05 17:13:19 +0900 (bb1b74e6d) @@ -1,4 +1,5 @@ normalize \ - 'NormalizerNFKC100("unify_katakana_bu_sound", true)' \ + 'NormalizerNFKC100("unify_katakana_bu_sound", true, \ + "report_source_offset", true)' \ "ヴァヴィヴヴェヴォヴ" \ - WITH_TYPES + WITH_CHECKS|WITH_TYPES Modified: test/command/suite/normalizers/nfkc100/unify_katakana_v_sounds.expected (+27 -2) =================================================================== --- test/command/suite/normalizers/nfkc100/unify_katakana_v_sounds.expected 2018-11-05 16:39:24 +0900 (adc07d828) +++ test/command/suite/normalizers/nfkc100/unify_katakana_v_sounds.expected 2018-11-05 17:13:19 +0900 (f6197415a) @@ -1,4 +1,4 @@ -normalize 'NormalizerNFKC100("unify_katakana_v_sounds", true)' "ヴァヴィヴヴェヴォヴ" WITH_TYPES +normalize 'NormalizerNFKC100("unify_katakana_v_sounds", true, "report_source_offset", true)' "ヴァヴィヴヴェヴォヴ" WITH_CHECKS|WITH_TYPES [ [ 0, @@ -16,7 +16,32 @@ normalize 'NormalizerNFKC100("unify_katakana_v_sounds", true)' "ヴァヴィ "katakana" ], "checks": [ - + 3, + 0, + 0, + 6, + 0, + 0, + 6, + 0, + 0, + 3, + 0, + 0, + 6, + 0, + 0, + 6, + 0, + 0 + ], + "offsets": [ + 0, + 6, + 12, + 15, + 21, + 27 ] } ] Modified: test/command/suite/normalizers/nfkc100/unify_katakana_v_sounds.test (+3 -2) =================================================================== --- test/command/suite/normalizers/nfkc100/unify_katakana_v_sounds.test 2018-11-05 16:39:24 +0900 (8198e2932) +++ test/command/suite/normalizers/nfkc100/unify_katakana_v_sounds.test 2018-11-05 17:13:19 +0900 (407e48a7c) @@ -1,4 +1,5 @@ normalize \ - 'NormalizerNFKC100("unify_katakana_v_sounds", true)' \ + 'NormalizerNFKC100("unify_katakana_v_sounds", true, \ + "report_source_offset", true)' \ "ヴァヴィヴヴェヴォヴ" \ - WITH_TYPES + WITH_CHECKS|WITH_TYPES -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20181105/bb8ba178/attachment-0001.html>
