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

Add hardcoded reverses for hardcoded transliterators #3994

Merged
merged 2 commits into from
Sep 4, 2023
Merged

Add hardcoded reverses for hardcoded transliterators #3994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1bcf4b
add hardcoded inverses
skius Sep 3, 2023
d59d871
add tests
skius Sep 3, 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
21 changes: 17 additions & 4 deletions experimental/transliterator_parser/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ mod tests {
# splits up the forward rules
forward rule that > splits up rule groups ;
:: InterIndic-Devanagari ;
:: NFC ;
";

let t_map = HashMap::from([(
Expand Down Expand Up @@ -219,10 +220,16 @@ mod tests {
filter: parse_set_cp(r"[\ ]"),
id: Cow::Borrowed("x-any-remove"),
}];
let expected_id_group3 = vec![ds::SimpleId {
filter: FilterSet::all(),
id: Cow::Borrowed("x-interindic-devanagari"),
}];
let expected_id_group3 = vec![
ds::SimpleId {
filter: FilterSet::all(),
id: Cow::Borrowed("x-interindic-devanagari"),
},
ds::SimpleId {
filter: FilterSet::all(),
id: Cow::Borrowed("x-any-nfc"),
},
];

let expected_id_group_list: Vec<VarZeroVec<'_, ds::SimpleIdULE>> = vec![
VarZeroVec::from(&expected_id_group1),
Expand Down Expand Up @@ -293,6 +300,7 @@ mod tests {
variable_table: expected_var_table,
visibility: true,
dependencies: VarZeroVec::from(&[
"x-any-nfc",
"x-any-remove",
"x-interindic-devanagari",
"x-latin-interindic",
Expand All @@ -304,6 +312,10 @@ mod tests {
let expected_filter = FilterSet::all();

let expected_id_group1 = vec![
ds::SimpleId {
filter: FilterSet::all(),
id: Cow::Borrowed("x-any-nfd"),
},
ds::SimpleId {
filter: FilterSet::all(),
id: Cow::Borrowed("x-devanagari-interindic"),
Expand Down Expand Up @@ -390,6 +402,7 @@ mod tests {
visibility: true,
dependencies: VarZeroVec::from(&[
"und-t-s0-anyrev-d0-addrndsp-m0-fifty",
"x-any-nfd",
"x-any-revfncall",
"x-devanagari-interindic",
"x-interindic-latin",
Expand Down
29 changes: 17 additions & 12 deletions experimental/transliterator_parser/src/parse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,21 +108,26 @@ pub(crate) struct BasicId {
}

impl BasicId {
pub(crate) fn is_null(&self) -> bool {
self.source.to_lowercase() == "any"
&& self.target.to_lowercase() == "null"
&& self.variant.is_none()
}

pub(crate) fn reverse(self) -> Self {
if self.is_null() {
return self;
}
// TODO(#3736): add hardcoded reverses here
let source = self.source.to_lowercase();
let target = self.target.to_lowercase();
let (new_source, new_target) = match (source.as_str(), target.as_str()) {
// hardcoded inverses
("any", "lower") => (self.source, "Upper".to_string()),
("any", "upper") => (self.source, "Lower".to_string()),
("any", "nfc") => (self.source, "NFD".to_string()),
("any", "nfd") => (self.source, "NFC".to_string()),
("any", "nfkc") => (self.source, "NFKD".to_string()),
("any", "nfkd") => (self.source, "NFKC".to_string()),
// no-ops
("any", "remove" | "null") => (self.source, self.target),
// default inverse swaps source and target
_ => (self.target, self.source),
};

Self {
source: self.target,
target: self.source,
source: new_source,
target: new_target,
variant: self.variant,
}
}
Expand Down
Loading