ElnuDev/rust-jmdict
1
0
Fork 0
mirror of https://github.com/ElnuDev/rust-jmdict.git synced 2025-07-01 21:36:01 -07:00
Code Issues Projects Releases Packages Wiki Activity

shave 4 bytes off the Gloss and LoanwordSource representations

Browse source 
This saves 5.29 MiB of payload when compiling with `--features full`.
The total payload in that configuration is now 66.72 MiB
(breaking down into 30.75 MiB raw text plus 35.97 MiB metadata).
This commit is contained in:
Stefan Majewsky 2021-04-18 14:33:13 +02:00
parent 5ceeec3acc
commit 45319ccf60
3 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib.rs
View file

@ -341,9 +341,9 @@ wrap_iterator!(&'static str, 2, Strings);
wrap_iterator!(PartOfSpeech, 1, PartsOfSpeech);
wrap_iterator!(SenseTopic, 1, SenseTopics);
wrap_iterator!(SenseInfo, 1, SenseInfos);
wrap_iterator!(LoanwordSource, 5, LoanwordSources);
wrap_iterator!(LoanwordSource, 4, LoanwordSources);
wrap_iterator!(Dialect, 1, Dialects);
wrap_iterator!(Gloss, 3, Glosses);
wrap_iterator!(Gloss, 2, Glosses);
///An iterator providing fast access to objects in the database. Instances of this iterator
///can be copied cheaply.

20
src/payload.rs
View file

@ -167,13 +167,13 @@ impl FromPayload<1> for SenseInfo {
}
}
impl FromPayload<5> for LoanwordSource {
fn get(data: &[u32; 5]) -> Self {
impl FromPayload<4> for LoanwordSource {
fn get(data: &[u32; 4]) -> Self {
Self {
text: get_str(data[0], data[1]),
text: get_str(data[0] & 0x0FFFFFFF, data[1]),
language: get_str(data[2], data[3]),
is_partial: (data[4] & 0x1) == 0x1,
is_wasei: (data[4] & 0x2) == 0x2,
is_partial: (data[0] & 0x10000000) == 0x10000000,
is_wasei: (data[0] & 0x20000000) == 0x20000000,
}
}
}
@ -184,12 +184,12 @@ impl FromPayload<1> for Dialect {
}
}
impl FromPayload<3> for Gloss {
fn get(data: &[u32; 3]) -> Self {
let lang_code = data[2] & 0x0000FFFF;
let type_code = (data[2] & 0xFFFF0000) >> 16;
impl FromPayload<2> for Gloss {
fn get(data: &[u32; 2]) -> Self {
let lang_code = (data[0] & 0xF0000000) >> 28;
let type_code = (data[1] & 0xF0000000) >> 28;
Gloss {
text: get_str(data[0], data[1]),
text: get_str(data[0] & 0x0FFFFFFF, data[1] & 0x0FFFFFFF),
language: jmdict_enums::EnumPayload::from_u32(lang_code),
gloss_type: jmdict_enums::EnumPayload::from_u32(type_code),
}