holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shrink the size of Expr (#12610)

Browse Source 
# Description
Continuing from #12568, this PR further reduces the size of `Expr` from
64 to 40 bytes. It also reduces `Expression` from 128 to 96 bytes and
`Type` from 32 to 24 bytes.

This was accomplished by:
- for `Expr` with multiple fields (e.g., `Expr::Thing(A, B, C)`),
merging the fields into new AST struct types and then boxing this struct
(e.g. `Expr::Thing(Box<ABC>)`).
- replacing `Vec<T>` with `Box<[T]>` in multiple places. `Expr`s and
`Expression`s should rarely be mutated, if at all, so this optimization
makes sense.

By reducing the size of these types, I didn't notice a large performance
improvement (at least compared to #12568). But this PR does reduce the
memory usage of nushell. My config is somewhat light so I only noticed a
difference of 1.4MiB (38.9MiB vs 37.5MiB).

---------

Co-authored-by: Stefan Holderbach <sholderbach@users.noreply.github.com>
This commit is contained in:
Ian Manske
2024-04-24 15:46:35 +00:00
committed by GitHub
parent c52884b3c8
commit 9996e4a1f8
195 changed files with 688 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/nu-protocol/src/engine/pattern_match.rs
View File

@ -141,11 +141,11 @@ impl Matcher for Pattern {
false
}
}
Expr::ValueWithUnit(amount, unit) => {
let span = unit.span;
Expr::ValueWithUnit(val) => {
let span = val.unit.span;
if let Expr::Int(size) = amount.expr {
match &unit.item.build_value(size, span) {
if let Expr::Int(size) = val.expr.expr {
match &val.unit.item.build_value(size, span) {
Ok(v) => v == value,
_ => false,
}
@ -153,10 +153,10 @@ impl Matcher for Pattern {
false
}
}
Expr::Range(start, step, end, inclusion) => {
Expr::Range(range) => {
// TODO: Add support for floats
let start = if let Some(start) = &start {
let start = if let Some(start) = &range.from {
match &start.expr {
Expr::Int(start) => *start,
_ => return false,
@ -165,7 +165,7 @@ impl Matcher for Pattern {
0
};
let end = if let Some(end) = &end {
let end = if let Some(end) = &range.to {
match &end.expr {
Expr::Int(end) => *end,
_ => return false,
@ -174,7 +174,7 @@ impl Matcher for Pattern {
i64::MAX
};
let step = if let Some(step) = step {
let step = if let Some(step) = &range.next {
match &step.expr {
Expr::Int(step) => *step - start,
_ => return false,
@ -192,7 +192,7 @@ impl Matcher for Pattern {
};
if let Value::Int { val, .. } = &value {
if matches!(inclusion.inclusion, RangeInclusion::RightExclusive) {
if matches!(range.operator.inclusion, RangeInclusion::RightExclusive) {
*val >= start && *val < end && ((*val - start) % step) == 0
} else {
*val >= start && *val <= end && ((*val - start) % step) == 0