Skip to content

Fix inaccurate Ty::size values after #166 #173

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
sasial-dev merged 2 commits into from
Mar 16, 2025
Merged

Fix inaccurate Ty::size values after #166 #173

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
893ddac
Fix inaccurate Ty::size values after #166
daimond113 Mar 15, 2025
efdc674
Run rustfmt
daimond113 Mar 15, 2025
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
19 changes: 12 additions & 7 deletions zap/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,11 @@ impl<'src> Ty<'src> {
if let Some(exact) = len.exact() {
(exact as usize, Some(exact as usize))
} else {
let len_size = len.numty().unwrap_or(NumTy::U16).size();

(
len.min().map(|min| (min as usize) + 2).unwrap_or(2),
len.max().map(|max| (max as usize) + 2),
len.min().map(|min| min as usize).unwrap_or(0) + len_size,
len.max().map(|max| (max as usize) + len_size),
)
}
}
Expand All @@ -228,26 +230,29 @@ impl<'src> Ty<'src> {
if let Some(exact) = len.exact() {
(exact as usize, Some(exact as usize))
} else {
let len_size = len.numty().unwrap_or(NumTy::U16).size();

(
len.min().map(|min| (min as usize) + 2).unwrap_or(2),
len.max().map(|max| (max as usize) + 2),
len.min().map(|min| min as usize).unwrap_or(0) + len_size,
len.max().map(|max| (max as usize) + len_size),
)
}
}

Self::Arr(ty, len) => {
let (ty_min, ty_max) = ty.size(tydecls, recursed);
let len_min = len.min().map(|min| min as usize).unwrap_or(0);
let len_size = len.numty().unwrap_or(NumTy::U16).size();

if let Some(exact) = len.exact() {
(ty_min * (exact as usize), ty_max.map(|max| ty_max.unwrap() * max))
} else if let Some(len_max) = len.max() {
(
ty_min * len_min + 2,
ty_max.map(|ty_max| ty_max * (len_max as usize) + 2),
ty_min * len_min + len_size,
ty_max.map(|ty_max| ty_max * (len_max as usize) + len_size),
)
} else {
(ty_min * len_min + 2, None)
(ty_min * len_min + len_size, None)
}
}

Expand Down
Loading