Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NormalizerNFKC: rename unify_katakana_z_sounds to unify_katakana_zu_small_sounds #1512

Merged
merged 3 commits into from
Feb 6, 2023
Merged

NormalizerNFKC: rename unify_katakana_z_sounds to unify_katakana_zu_small_sounds #1512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ec2f9e
Rename z_sounds to zu_sounds
HashidaTKS Feb 3, 2023
a72a33a
Rename zu_sounds to zu_small_sounds
HashidaTKS Feb 3, 2023
6d8be00
Align indents
HashidaTKS Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/grn_nfkc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ typedef struct {
grn_bool unify_middle_dot;
grn_bool unify_katakana_v_sounds;
grn_bool unify_katakana_bu_sound;
grn_bool unify_katakana_z_sounds;
grn_bool unify_katakana_zu_small_sounds;
grn_bool unify_katakana_du_small_sounds;
grn_bool unify_katakana_wo_sound;
grn_bool unify_katakana_di_sound;
Expand Down
8 changes: 4 additions & 4 deletions lib/nfkc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ grn_nfkc_normalize_options_init(grn_ctx *ctx,
options->unify_middle_dot = GRN_FALSE;
options->unify_katakana_v_sounds = GRN_FALSE;
options->unify_katakana_bu_sound = GRN_FALSE;
options->unify_katakana_z_sounds = GRN_FALSE;
options->unify_katakana_zu_small_sounds = GRN_FALSE;
options->unify_katakana_du_small_sounds = GRN_FALSE;
options->unify_katakana_wo_sound = GRN_FALSE;
options->unify_katakana_di_sound = GRN_FALSE;
Expand Down Expand Up @@ -197,12 +197,12 @@ grn_nfkc_normalize_options_apply(grn_ctx *ctx,
raw_options,
i,
options->unify_katakana_bu_sound);
} else if (GRN_RAW_STRING_EQUAL_CSTRING(name_raw, "unify_katakana_z_sounds")) {
options->unify_katakana_z_sounds =
} else if (GRN_RAW_STRING_EQUAL_CSTRING(name_raw, "unify_katakana_zu_small_sounds")) {
options->unify_katakana_zu_small_sounds =
grn_vector_get_element_bool(ctx,
raw_options,
i,
options->unify_katakana_z_sounds);
options->unify_katakana_zu_small_sounds);
} else if (GRN_RAW_STRING_EQUAL_CSTRING(name_raw, "unify_katakana_du_small_sounds")) {
options->unify_katakana_du_small_sounds =
grn_vector_get_element_bool(ctx,
Expand Down
28 changes: 14 additions & 14 deletions lib/normalizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1477,16 +1477,16 @@ grn_nfkc_normalize_unify_katakana_bu_sound(grn_ctx *ctx,
}

static const unsigned char *
grn_nfkc_normalize_unify_katakana_z_sounds(grn_ctx *ctx,
const unsigned char *start,
const unsigned char *current,
const unsigned char *end,
size_t *n_used_bytes,
size_t *n_used_characters,
unsigned char *unified_buffer,
size_t *n_unified_bytes,
size_t *n_unified_characters,
void *user_data)
grn_nfkc_normalize_unify_katakana_zu_small_sounds(grn_ctx *ctx,
const unsigned char *start,
const unsigned char *current,
const unsigned char *end,
size_t *n_used_bytes,
size_t *n_used_characters,
unsigned char *unified_buffer,
size_t *n_unified_bytes,
size_t *n_unified_characters,
void *user_data)
{
size_t char_length;

Expand Down Expand Up @@ -1975,7 +1975,7 @@ grn_nfkc_normalize_unify(grn_ctx *ctx,
data->options->unify_middle_dot ||
data->options->unify_katakana_v_sounds ||
data->options->unify_katakana_bu_sound ||
data->options->unify_katakana_z_sounds ||
data->options->unify_katakana_zu_small_sounds ||
data->options->unify_katakana_du_small_sounds ||
data->options->unify_katakana_wo_sound ||
data->options->unify_katakana_di_sound ||
Expand Down Expand Up @@ -2047,17 +2047,17 @@ grn_nfkc_normalize_unify(grn_ctx *ctx,
need_swap = GRN_TRUE;
}

if (data->options->unify_katakana_z_sounds) {
if (data->options->unify_katakana_zu_small_sounds) {
if (need_swap) {
grn_nfkc_normalize_context_swap(ctx, &(data->context), &unify);
grn_nfkc_normalize_context_rewind(ctx, &unify);
}
grn_nfkc_normalize_unify_stateful(ctx,
data,
&unify,
grn_nfkc_normalize_unify_katakana_z_sounds,
grn_nfkc_normalize_unify_katakana_zu_small_sounds,
NULL,
"[unify][katakana-z-sounds]");
"[unify][katakana-zu-small-sounds]");
if (ctx->rc != GRN_SUCCESS) {
goto exit;
}
Expand Down
2 changes: 1 addition & 1 deletion .../nfkc100/unify_katakana_z_sounds.expected → ...0/unify_katakana_zu_small_sounds.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
normalize 'NormalizerNFKC100("unify_katakana_z_sounds", true, "report_source_offset", true)' "ズァズィズズェズォ" WITH_CHECKS|WITH_TYPES
normalize 'NormalizerNFKC100("unify_katakana_zu_small_sounds", true, "report_source_offset", true)' "ズァズィズズェズォ" WITH_CHECKS|WITH_TYPES
[
[
0,
Expand Down
2 changes: 1 addition & 1 deletion ...zers/nfkc130/unify_katakana_z_sounds.test → ...kc100/unify_katakana_zu_small_sounds.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
normalize \
'NormalizerNFKC130("unify_katakana_z_sounds", true, \
'NormalizerNFKC100("unify_katakana_zu_small_sounds", true, \
"report_source_offset", true)' \
"ズァズィズズェズォ" \
WITH_CHECKS|WITH_TYPES
2 changes: 1 addition & 1 deletion .../nfkc130/unify_katakana_z_sounds.expected → ...1/unify_katakana_zu_small_sounds.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
normalize 'NormalizerNFKC130("unify_katakana_z_sounds", true, "report_source_offset", true)' "ズァズィズズェズォ" WITH_CHECKS|WITH_TYPES
normalize 'NormalizerNFKC121("unify_katakana_zu_small_sounds", true, "report_source_offset", true)' "ズァズィズズェズォ" WITH_CHECKS|WITH_TYPES
[
[
0,
Expand Down
2 changes: 1 addition & 1 deletion ...zers/nfkc100/unify_katakana_z_sounds.test → ...kc121/unify_katakana_zu_small_sounds.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
normalize \
'NormalizerNFKC100("unify_katakana_z_sounds", true, \
'NormalizerNFKC121("unify_katakana_zu_small_sounds", true, \
"report_source_offset", true)' \
"ズァズィズズェズォ" \
WITH_CHECKS|WITH_TYPES
2 changes: 1 addition & 1 deletion .../nfkc121/unify_katakana_z_sounds.expected → ...0/unify_katakana_zu_small_sounds.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
normalize 'NormalizerNFKC121("unify_katakana_z_sounds", true, "report_source_offset", true)' "ズァズィズズェズォ" WITH_CHECKS|WITH_TYPES
normalize 'NormalizerNFKC130("unify_katakana_zu_small_sounds", true, "report_source_offset", true)' "ズァズィズズェズォ" WITH_CHECKS|WITH_TYPES
[
[
0,
Expand Down
2 changes: 1 addition & 1 deletion ...zers/nfkc150/unify_katakana_z_sounds.test → ...kc130/unify_katakana_zu_small_sounds.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
normalize \
'NormalizerNFKC150("unify_katakana_z_sounds", true, \
'NormalizerNFKC130("unify_katakana_zu_small_sounds", true, \
"report_source_offset", true)' \
"ズァズィズズェズォ" \
WITH_CHECKS|WITH_TYPES
2 changes: 1 addition & 1 deletion .../nfkc150/unify_katakana_z_sounds.expected → ...0/unify_katakana_zu_small_sounds.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
normalize 'NormalizerNFKC150("unify_katakana_z_sounds", true, "report_source_offset", true)' "ズァズィズズェズォ" WITH_CHECKS|WITH_TYPES
normalize 'NormalizerNFKC150("unify_katakana_zu_small_sounds", true, "report_source_offset", true)' "ズァズィズズェズォ" WITH_CHECKS|WITH_TYPES
[
[
0,
Expand Down
2 changes: 1 addition & 1 deletion ...zers/nfkc121/unify_katakana_z_sounds.test → ...kc150/unify_katakana_zu_small_sounds.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
normalize \
'NormalizerNFKC121("unify_katakana_z_sounds", true, \
'NormalizerNFKC150("unify_katakana_zu_small_sounds", true, \
"report_source_offset", true)' \
"ズァズィズズェズォ" \
WITH_CHECKS|WITH_TYPES