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

Optimize string slice. #938

Merged
merged 2 commits into from
Dec 2, 2024
Merged

Optimize string slice. #938

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
9d0ac78
Bump version
schungx Nov 2, 2024
ae6e9d4
Optimize string slice
schungx Dec 2, 2024
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
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
Rhai Release Notes
==================

Version 1.21.0
==============

Enhancements
------------

* If a string slice refers to the entire string, the slice is not cloned but returned as-is.


Version 1.20.0
==============

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = [".", "codegen"]

[package]
name = "rhai"
version = "1.20.0"
version = "1.21.0"
rust-version = "1.66.0"
edition = "2018"
resolver = "2"
Expand Down
49 changes: 39 additions & 10 deletions src/eval/chaining.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use crate::engine::{FN_IDX_GET, FN_IDX_SET};
use crate::types::dynamic::Union;
use crate::{
calc_fn_hash, Dynamic, Engine, ExclusiveRange, FnArgsVec, InclusiveRange, OnceCell, Position,

Check warning on line 9 in src/eval/chaining.rs

View workflow job for this annotation

GitHub Actions / Build (ubuntu-latest, --features testing-environ,no_index,serde,metadata,internals,debugging, sta... 

unused imports: `ExclusiveRange` and `InclusiveRange`
RhaiResult, RhaiResultOf, Scope, ERR,
};
#[cfg(feature = "no_std")]
Expand Down Expand Up @@ -311,6 +311,7 @@

#[cfg(not(feature = "no_index"))]
Dynamic(Union::Str(s, ..)) => {
// Numeric index - character
match idx.as_int() {
Ok(index) => {
let (ch, offset) = if index >= 0 {
Expand Down Expand Up @@ -362,11 +363,29 @@
index: offset,
})
}

// Range index on empty string - empty slice
Err(typ)
if (typ == std::any::type_name::<ExclusiveRange>()
|| typ == std::any::type_name::<InclusiveRange>())
&& s.is_empty() =>
{
let value = s.clone().into();
Ok(Target::StringSlice {
source: target,
value,
start: 0,
end: 0,
exclusive: true,
})
}

// Range index - slice
Err(typ) if typ == std::any::type_name::<ExclusiveRange>() => {
// val_str[range]
let idx = idx.read_lock::<ExclusiveRange>().unwrap();
let range = &*idx;
let range = idx.read_lock::<ExclusiveRange>().unwrap().clone();
let chars_count = s.chars().count();

let start = if range.start >= 0 {
range.start as usize
} else {
Expand All @@ -383,22 +402,26 @@
.unwrap_or(0)
};

let take = if end > start { end - start } else { 0 };
let value = s.chars().skip(start).take(take).collect::<String>();
let value = if start == 0 && end >= chars_count {
s.clone().into()
} else {
let take = if end > start { end - start } else { 0 };
s.chars().skip(start).take(take).collect::<String>().into()
};

Ok(Target::StringSlice {
source: target,
value: value.into(),
value,
start,
end,
exclusive: true,
})
}
Err(typ) if typ == std::any::type_name::<InclusiveRange>() => {
// val_str[range]
let idx = idx.read_lock::<InclusiveRange>().unwrap();
let range = &*idx;
let range = idx.read_lock::<InclusiveRange>().unwrap().clone();
let chars_count = s.chars().count();

let start = if *range.start() >= 0 {
*range.start() as usize
} else {
Expand All @@ -415,17 +438,23 @@
.unwrap_or(0)
};

let take = if end > start { end - start + 1 } else { 0 };
let value = s.chars().skip(start).take(take).collect::<String>();
let value = if start == 0 && end >= chars_count - 1 {
s.clone().into()
} else {
let take = if end > start { end - start + 1 } else { 0 };
s.chars().skip(start).take(take).collect::<String>().into()
};

Ok(Target::StringSlice {
source: target,
value: value.into(),
value,
start,
end,
exclusive: false,
})
}

// Unsupported index type
Err(typ) => Err(self.make_type_mismatch_err::<crate::INT>(typ, idx_pos)),
}
}
Expand Down
Loading