diff --git a/src/inflect.rs b/src/inflect.rs index e30fd65..4e15ba6 100644 --- a/src/inflect.rs +++ b/src/inflect.rs @@ -230,15 +230,15 @@ fn pl_sb_c_is_ides_list() -> Vec { } fn si_sb_c_is_ides_list() -> Vec { - return make_pl_si_lists(pl_sb_c_is_ides_list(), "ides", Some(2), true).0; + return make_pl_si_lists(pl_sb_c_is_ides_list(), "ides", Some(2), false).0; } fn si_sb_c_is_ides_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_is_ides_list(), "ides", Some(2), true).1; + return make_pl_si_lists(pl_sb_c_is_ides_list(), "ides", Some(2), false).1; } fn pl_sb_c_is_ides_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_is_ides_list(), "ides", Some(2), true).2; + return make_pl_si_lists(pl_sb_c_is_ides_list(), "ides", Some(2), false).2; } fn pl_sb_c_a_ata_list() -> Vec { @@ -274,19 +274,19 @@ fn pl_sb_c_a_ata_list() -> Vec { } fn si_sb_c_a_ata_list() -> Vec { - return make_pl_si_lists(pl_sb_c_a_ata_list(), "ata", Some(1), false).0; + return make_pl_si_lists(pl_sb_c_a_ata_list(), "ata", Some(1), true).0; } fn si_sb_c_a_ata_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_a_ata_list(), "ata", Some(1), false).1; + return make_pl_si_lists(pl_sb_c_a_ata_list(), "ata", Some(1), true).1; } fn pl_sb_c_a_ata_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_a_ata_list(), "ata", Some(1), false).2; + return make_pl_si_lists(pl_sb_c_a_ata_list(), "ata", Some(1), true).2; } fn pl_sb_c_a_ata() -> String { - return make_pl_si_lists(pl_sb_c_a_ata_list(), "ata", Some(1), false).3; + return make_pl_si_lists(pl_sb_c_a_ata_list(), "ata", Some(1), true).3; } fn pl_sb_u_a_ae_list() -> Vec { @@ -297,19 +297,19 @@ fn pl_sb_u_a_ae_list() -> Vec { } fn si_sb_u_a_ae_list() -> Vec { - return make_pl_si_lists(pl_sb_u_a_ae_list(), "e", None, false).0; + return make_pl_si_lists(pl_sb_u_a_ae_list(), "e", None, true).0; } fn si_sb_u_a_ae_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_a_ae_list(), "e", None, false).1; + return make_pl_si_lists(pl_sb_u_a_ae_list(), "e", None, true).1; } fn pl_sb_u_a_ae_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_a_ae_list(), "e", None, false).2; + return make_pl_si_lists(pl_sb_u_a_ae_list(), "e", None, true).2; } fn pl_sb_u_a_ae() -> String { - return make_pl_si_lists(pl_sb_u_a_ae_list(), "e", None, false).3; + return make_pl_si_lists(pl_sb_u_a_ae_list(), "e", None, true).3; } fn pl_sb_c_a_ae_list() -> Vec { @@ -336,19 +336,19 @@ fn pl_sb_c_a_ae_list() -> Vec { } fn si_sb_c_a_ae_list() -> Vec { - return make_pl_si_lists(pl_sb_c_a_ae_list(), "e", None, false).0; + return make_pl_si_lists(pl_sb_c_a_ae_list(), "e", None, true).0; } fn si_sb_c_a_ae_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_a_ae_list(), "e", None, false).1; + return make_pl_si_lists(pl_sb_c_a_ae_list(), "e", None, true).1; } fn pl_sb_c_a_ae_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_a_ae_list(), "e", None, false).2; + return make_pl_si_lists(pl_sb_c_a_ae_list(), "e", None, true).2; } fn pl_sb_c_a_ae() -> String { - return make_pl_si_lists(pl_sb_c_a_ae_list(), "e", None, false).3; + return make_pl_si_lists(pl_sb_c_a_ae_list(), "e", None, true).3; } fn pl_sb_c_en_ina_list() -> Vec { @@ -359,19 +359,19 @@ fn pl_sb_c_en_ina_list() -> Vec { } fn si_sb_c_en_ina_list() -> Vec { - return make_pl_si_lists(pl_sb_c_en_ina_list(), "ina", Some(2), false).0; + return make_pl_si_lists(pl_sb_c_en_ina_list(), "ina", Some(2), true).0; } fn si_sb_c_en_ina_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_en_ina_list(), "ina", Some(2), false).1; + return make_pl_si_lists(pl_sb_c_en_ina_list(), "ina", Some(2), true).1; } fn pl_sb_c_en_ina_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_en_ina_list(), "ina", Some(2), false).2; + return make_pl_si_lists(pl_sb_c_en_ina_list(), "ina", Some(2), true).2; } fn pl_sb_c_en_ina() -> String { - return make_pl_si_lists(pl_sb_c_en_ina_list(), "ina", Some(2), false).3; + return make_pl_si_lists(pl_sb_c_en_ina_list(), "ina", Some(2), true).3; } fn pl_sb_u_um_a_list() -> Vec { @@ -392,19 +392,19 @@ fn pl_sb_u_um_a_list() -> Vec { } fn si_sb_u_um_a_list() -> Vec { - return make_pl_si_lists(pl_sb_u_um_a_list(), "a", Some(2), false).0; + return make_pl_si_lists(pl_sb_u_um_a_list(), "a", Some(2), true).0; } fn si_sb_u_um_a_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_um_a_list(), "a", Some(2), false).1; + return make_pl_si_lists(pl_sb_u_um_a_list(), "a", Some(2), true).1; } fn pl_sb_u_um_a_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_um_a_list(), "a", Some(2), false).2; + return make_pl_si_lists(pl_sb_u_um_a_list(), "a", Some(2), true).2; } fn pl_sb_u_um_a() -> String { - return make_pl_si_lists(pl_sb_u_um_a_list(), "a", Some(2), false).3; + return make_pl_si_lists(pl_sb_u_um_a_list(), "a", Some(2), true).3; } fn pl_sb_c_um_a_list() -> Vec { @@ -446,19 +446,19 @@ fn pl_sb_c_um_a_list() -> Vec { } fn si_sb_c_um_a_list() -> Vec { - return make_pl_si_lists(pl_sb_c_um_a_list(), "a", Some(2), false).0; + return make_pl_si_lists(pl_sb_c_um_a_list(), "a", Some(2), true).0; } fn si_sb_c_um_a_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_um_a_list(), "a", Some(2), false).1; + return make_pl_si_lists(pl_sb_c_um_a_list(), "a", Some(2), true).1; } fn pl_sb_c_um_a_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_um_a_list(), "a", Some(2), false).2; + return make_pl_si_lists(pl_sb_c_um_a_list(), "a", Some(2), true).2; } fn pl_sb_c_um_a() -> String { - return make_pl_si_lists(pl_sb_c_um_a_list(), "a", Some(2), false).3; + return make_pl_si_lists(pl_sb_c_um_a_list(), "a", Some(2), true).3; } fn pl_sb_u_us_i_list() -> Vec { @@ -479,19 +479,19 @@ fn pl_sb_u_us_i_list() -> Vec { } fn si_sb_u_us_i_list() -> Vec { - return make_pl_si_lists(pl_sb_u_us_i_list(), "i", Some(2), false).0; + return make_pl_si_lists(pl_sb_u_us_i_list(), "i", Some(2), true).0; } fn si_sb_u_us_i_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_us_i_list(), "i", Some(2), false).1; + return make_pl_si_lists(pl_sb_u_us_i_list(), "i", Some(2), true).1; } fn pl_sb_u_us_i_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_us_i_list(), "i", Some(2), false).2; + return make_pl_si_lists(pl_sb_u_us_i_list(), "i", Some(2), true).2; } fn pl_sb_u_us_i() -> String { - return make_pl_si_lists(pl_sb_u_us_i_list(), "i", Some(2), false).3; + return make_pl_si_lists(pl_sb_u_us_i_list(), "i", Some(2), true).3; } fn pl_sb_c_us_i_list() -> Vec { @@ -517,19 +517,19 @@ fn pl_sb_c_us_i_list() -> Vec { } fn si_sb_c_us_i_list() -> Vec { - return make_pl_si_lists(pl_sb_c_us_i_list(), "i", Some(2), false).0; + return make_pl_si_lists(pl_sb_c_us_i_list(), "i", Some(2), true).0; } fn si_sb_c_us_i_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_us_i_list(), "i", Some(2), false).1; + return make_pl_si_lists(pl_sb_c_us_i_list(), "i", Some(2), true).1; } fn pl_sb_c_us_i_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_us_i_list(), "i", Some(2), false).2; + return make_pl_si_lists(pl_sb_c_us_i_list(), "i", Some(2), true).2; } fn pl_sb_c_us_i() -> String { - return make_pl_si_lists(pl_sb_c_us_i_list(), "i", Some(2), false).3; + return make_pl_si_lists(pl_sb_c_us_i_list(), "i", Some(2), true).3; } fn pl_sb_c_us_us() -> Vec { @@ -561,19 +561,19 @@ fn pl_sb_u_on_a_list() -> Vec { } fn si_sb_u_on_a_list() -> Vec { - return make_pl_si_lists(pl_sb_u_on_a_list(), "a", Some(2), false).0; + return make_pl_si_lists(pl_sb_u_on_a_list(), "a", Some(2), true).0; } fn si_sb_u_on_a_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_on_a_list(), "a", Some(2), false).1; + return make_pl_si_lists(pl_sb_u_on_a_list(), "a", Some(2), true).1; } fn pl_sb_u_on_a_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_on_a_list(), "a", Some(2), false).2; + return make_pl_si_lists(pl_sb_u_on_a_list(), "a", Some(2), true).2; } fn pl_sb_u_on_a() -> String { - return make_pl_si_lists(pl_sb_u_on_a_list(), "a", Some(2), false).3; + return make_pl_si_lists(pl_sb_u_on_a_list(), "a", Some(2), true).3; } fn pl_sb_c_on_a_list() -> Vec { @@ -584,19 +584,19 @@ fn pl_sb_c_on_a_list() -> Vec { } fn si_sb_c_on_a_list() -> Vec { - return make_pl_si_lists(pl_sb_c_on_a_list(), "a", Some(2), false).0; + return make_pl_si_lists(pl_sb_c_on_a_list(), "a", Some(2), true).0; } fn si_sb_c_on_a_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_on_a_list(), "a", Some(2), false).1; + return make_pl_si_lists(pl_sb_c_on_a_list(), "a", Some(2), true).1; } fn pl_sb_c_on_a_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_on_a_list(), "a", Some(2), false).2; + return make_pl_si_lists(pl_sb_c_on_a_list(), "a", Some(2), true).2; } fn pl_sb_c_on_a() -> String { - return make_pl_si_lists(pl_sb_c_on_a_list(), "a", Some(2), false).3; + return make_pl_si_lists(pl_sb_c_on_a_list(), "a", Some(2), true).3; } fn pl_sb_c_o_i() -> Vec { @@ -863,19 +863,19 @@ fn pl_sb_u_ch_chs_list() -> Vec { } fn si_sb_u_ch_chs_list() -> Vec { - return make_pl_si_lists(pl_sb_u_ch_chs_list(), "s", None, false).0; + return make_pl_si_lists(pl_sb_u_ch_chs_list(), "s", None, true).0; } fn si_sb_u_ch_chs_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_ch_chs_list(), "s", None, false).1; + return make_pl_si_lists(pl_sb_u_ch_chs_list(), "s", None, true).1; } fn pl_sb_u_ch_chs_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_ch_chs_list(), "s", None, false).2; + return make_pl_si_lists(pl_sb_u_ch_chs_list(), "s", None, true).2; } fn pl_sb_u_ch_chs() -> String { - return make_pl_si_lists(pl_sb_u_ch_chs_list(), "s", None, false).3; + return make_pl_si_lists(pl_sb_u_ch_chs_list(), "s", None, true).3; } fn pl_sb_u_ex_ices_list() -> Vec { @@ -886,19 +886,19 @@ fn pl_sb_u_ex_ices_list() -> Vec { } fn si_sb_u_ex_ices_list() -> Vec { - return make_pl_si_lists(pl_sb_u_ex_ices_list(), "ices", Some(2), false).0; + return make_pl_si_lists(pl_sb_u_ex_ices_list(), "ices", Some(2), true).0; } fn si_sb_u_ex_ices_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_ex_ices_list(), "ices", Some(2), false).1; + return make_pl_si_lists(pl_sb_u_ex_ices_list(), "ices", Some(2), true).1; } fn pl_sb_u_ex_ices_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_ex_ices_list(), "ices", Some(2), false).2; + return make_pl_si_lists(pl_sb_u_ex_ices_list(), "ices", Some(2), true).2; } fn pl_sb_u_ex_ices() -> String { - return make_pl_si_lists(pl_sb_u_ex_ices_list(), "ices", Some(2), false).3; + return make_pl_si_lists(pl_sb_u_ex_ices_list(), "ices", Some(2), true).3; } fn pl_sb_u_ix_ices_list() -> Vec { @@ -909,19 +909,19 @@ fn pl_sb_u_ix_ices_list() -> Vec { } fn si_sb_u_ix_ices_list() -> Vec { - return make_pl_si_lists(pl_sb_u_ix_ices_list(), "ices", Some(2), false).0; + return make_pl_si_lists(pl_sb_u_ix_ices_list(), "ices", Some(2), true).0; } fn si_sb_u_ix_ices_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_ix_ices_list(), "ices", Some(2), false).1; + return make_pl_si_lists(pl_sb_u_ix_ices_list(), "ices", Some(2), true).1; } fn pl_sb_u_ix_ices_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_u_ix_ices_list(), "ices", Some(2), false).2; + return make_pl_si_lists(pl_sb_u_ix_ices_list(), "ices", Some(2), true).2; } fn pl_sb_u_ix_ices() -> String { - return make_pl_si_lists(pl_sb_u_ix_ices_list(), "ices", Some(2), false).3; + return make_pl_si_lists(pl_sb_u_ix_ices_list(), "ices", Some(2), true).3; } fn pl_sb_c_ex_ices_list() -> Vec { @@ -932,19 +932,19 @@ fn pl_sb_c_ex_ices_list() -> Vec { } fn si_sb_c_ex_ices_list() -> Vec { - return make_pl_si_lists(pl_sb_c_ex_ices_list(), "ices", Some(2), false).0; + return make_pl_si_lists(pl_sb_c_ex_ices_list(), "ices", Some(2), true).0; } fn si_sb_c_ex_ices_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_ex_ices_list(), "ices", Some(2), false).1; + return make_pl_si_lists(pl_sb_c_ex_ices_list(), "ices", Some(2), true).1; } fn pl_sb_c_ex_ices_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_ex_ices_list(), "ices", Some(2), false).2; + return make_pl_si_lists(pl_sb_c_ex_ices_list(), "ices", Some(2), true).2; } fn pl_sb_c_ex_ices() -> String { - return make_pl_si_lists(pl_sb_c_ex_ices_list(), "ices", Some(2), false).3; + return make_pl_si_lists(pl_sb_c_ex_ices_list(), "ices", Some(2), true).3; } fn pl_sb_c_ix_ices_list() -> Vec { @@ -955,19 +955,19 @@ fn pl_sb_c_ix_ices_list() -> Vec { } fn si_sb_c_ix_ices_list() -> Vec { - return make_pl_si_lists(pl_sb_c_ix_ices_list(), "ices", Some(2), false).0; + return make_pl_si_lists(pl_sb_c_ix_ices_list(), "ices", Some(2), true).0; } fn si_sb_c_ix_ices_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_ix_ices_list(), "ices", Some(2), false).1; + return make_pl_si_lists(pl_sb_c_ix_ices_list(), "ices", Some(2), true).1; } fn pl_sb_c_ix_ices_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_ix_ices_list(), "ices", Some(2), false).2; + return make_pl_si_lists(pl_sb_c_ix_ices_list(), "ices", Some(2), true).2; } fn pl_sb_c_ix_ices() -> String { - return make_pl_si_lists(pl_sb_c_ix_ices_list(), "ices", Some(2), false).3; + return make_pl_si_lists(pl_sb_c_ix_ices_list(), "ices", Some(2), true).3; } fn pl_sb_c_i_list() -> Vec { @@ -978,19 +978,19 @@ fn pl_sb_c_i_list() -> Vec { } fn si_sb_c_i_list() -> Vec { - return make_pl_si_lists(pl_sb_c_i_list(), "i", None, false).0; + return make_pl_si_lists(pl_sb_c_i_list(), "i", None, true).0; } fn si_sb_c_i_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_i_list(), "i", None, false).1; + return make_pl_si_lists(pl_sb_c_i_list(), "i", None, true).1; } fn pl_sb_c_i_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_i_list(), "i", None, false).2; + return make_pl_si_lists(pl_sb_c_i_list(), "i", None, true).2; } fn pl_sb_c_i() -> String { - return make_pl_si_lists(pl_sb_c_i_list(), "i", None, false).3; + return make_pl_si_lists(pl_sb_c_i_list(), "i", None, true).3; } fn pl_sb_c_im_list() -> Vec { @@ -1001,17 +1001,88 @@ fn pl_sb_c_im_list() -> Vec { } fn si_sb_c_im_list() -> Vec { - return make_pl_si_lists(pl_sb_c_im_list(), "im", None, false).0; + return make_pl_si_lists(pl_sb_c_im_list(), "im", None, true).0; } fn si_sb_c_im_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_im_list(), "im", None, false).1; + return make_pl_si_lists(pl_sb_c_im_list(), "im", None, true).1; } fn pl_sb_c_im_bysize() -> HashMap> { - return make_pl_si_lists(pl_sb_c_im_list(), "im", None, false).2; + return make_pl_si_lists(pl_sb_c_im_list(), "im", None, true).2; } fn pl_sb_c_im() -> String { - return make_pl_si_lists(pl_sb_c_im_list(), "im", None, false).3; + return make_pl_si_lists(pl_sb_c_im_list(), "im", None, true).3; +} + +fn pl_sb_u_man_mans_list() -> Vec { + return vec![ + "ataman", + "caiman", + "cayman", + "ceriman", + "desman", + "dolman", + "farman", + "harman", + "hetman", + "human", + "leman", + "ottoman", + "shaman", + "talisman" + ] + .iter() + .map(|s| s.to_string()) + .collect(); +} + +fn pl_sb_u_man_mans_caps_list() -> Vec { + return vec![ + "Alabaman", + "Bahaman", + "Burman", + "|German", + "Hiroshiman", + "Liman", + "Nakayaman", + "Norman", + "Oklahoman", + "Panaman", + "Roman", + "Selman", + "Sonaman", + "Tacoman", + "Yakiman", + "Yokohaman", + "Yuman" + ] + .iter() + .map(|s| s.to_string()) + .collect(); +} + +fn si_sb_u_man_mans_list() -> Vec { + return make_pl_si_lists(pl_sb_u_man_mans_list(), "s", None, false).0; +} + +fn si_sb_u_man_mans_caps_list() -> Vec { + return make_pl_si_lists(pl_sb_u_man_mans_caps_list(), "s", None, false).0; +} + +fn si_sb_u_man_mans_bysize() -> HashMap> { + return make_pl_si_lists(pl_sb_u_man_mans_list(), "s", None, false).1; +} + +fn si_sb_u_man_mans_caps_bysize() -> HashMap> { + return make_pl_si_lists(pl_sb_u_man_mans_caps_list(), "s", None, false).1; +} + +fn pl_sb_u_man_mans_bysize() -> HashMap> { + return make_pl_si_lists(pl_sb_u_man_mans_list(), "s", None, false).2; +} + +fn pl_sb_u_man_mans_caps_bysize() -> HashMap> { + return make_pl_si_lists(pl_sb_u_man_mans_caps_list(), "s", None, false).2; }