这是indexloc提供的服务，不要输入任何密码
Skip to content

simplify struct Table #182

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

Merged
merged 1 commit into from
Sep 15, 2024
Merged

simplify struct Table #182

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 13 additions & 18 deletions zlib-rs/src/inflate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,21 +263,16 @@ pub enum Mode {
Bad,
}

#[derive(Clone, Copy)]
#[derive(Default, Clone, Copy)]
#[allow(clippy::enum_variant_names)]
enum Codes {
Fixed(&'static [Code]),
#[default]
Fixed,
Codes,
Len,
Dist,
}

impl Default for Codes {
fn default() -> Self {
Codes::Fixed(&[])
}
}

#[derive(Default, Clone, Copy)]
struct Table {
codes: Codes,
Expand All @@ -297,12 +292,6 @@ pub(crate) struct State<'a> {
/// - bit 2 true to validate check value
wrap: usize,

/// table for length/literal codes
len_table: Table,

/// table for dist codes
dist_table: Table,

/// log base 2 of requested window size
wbits: usize,
// allocated window if needed (capacity == 0 if unused)
Expand Down Expand Up @@ -366,6 +355,12 @@ pub(crate) struct State<'a> {
dmax: usize,
flags: i32,

/// table for length/literal codes
len_table: Table,

/// table for dist codes
dist_table: Table,

codes_codes: [Code; crate::ENOUGH_LENS],
len_codes: [Code; crate::ENOUGH_LENS],
dist_codes: [Code; crate::ENOUGH_DISTS],
Expand Down Expand Up @@ -431,7 +426,7 @@ impl<'a> State<'a> {

fn len_table_ref(&self) -> &[Code] {
match self.len_table.codes {
Codes::Fixed(fixed) => fixed,
Codes::Fixed => &self::inffixed_tbl::LENFIX,
Codes::Codes => &self.codes_codes,
Codes::Len => &self.len_codes,
Codes::Dist => &self.dist_codes,
Expand All @@ -440,7 +435,7 @@ impl<'a> State<'a> {

fn dist_table_ref(&self) -> &[Code] {
match self.dist_table.codes {
Codes::Fixed(fixed) => fixed,
Codes::Fixed => &self::inffixed_tbl::DISTFIX,
Codes::Codes => &self.codes_codes,
Codes::Len => &self.len_codes,
Codes::Dist => &self.dist_codes,
Expand Down Expand Up @@ -955,12 +950,12 @@ impl<'a> State<'a> {
// eprintln!("inflate: fixed codes block (last = {last})");

self.len_table = Table {
codes: Codes::Fixed(&self::inffixed_tbl::LENFIX),
codes: Codes::Fixed,
bits: 9,
};

self.dist_table = Table {
codes: Codes::Fixed(&self::inffixed_tbl::DISTFIX),
codes: Codes::Fixed,
bits: 5,
};

Expand Down