kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Enable modifying constant shared values.

Browse Source
This commit is contained in:
Stephen Chung
2022-06-26 17:04:08 +08:00
parent 7068775f19
commit 335957fbc2
4 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/eval/stmt.rs
View File

@@ -250,7 +250,15 @@ impl Engine {
let var_name = lhs.get_variable_name(false).expect("`Expr::Variable`");
if !lhs_ptr.is_ref() {
#[cfg(not(feature = "no_closure"))]
// Temp results from expressions are flattened so should never be shared.
// A shared value may be provided by a variable resolver, however.
let is_temp_result = !lhs_ptr.is_ref() && !lhs_ptr.is_shared();
#[cfg(feature = "no_closure")]
let is_temp_result = !lhs_ptr.is_ref();
// Cannot assign to temp result from expression
if is_temp_result {
return Err(
ERR::ErrorAssignmentToConstant(var_name.to_string(), pos).into()
);
@@ -950,7 +958,7 @@ impl Engine {
if !export.is_empty() {
if !module.is_indexed() {
// Index the module (making a clone copy if necessary) if it is not indexed
let mut m = crate::func::native::shared_take_or_clone(module);
let mut m = crate::func::shared_take_or_clone(module);
m.build_index();
global.push_import(export.name.clone(), m);
} else {

21
src/types/dynamic.rs
View File

@@ -1003,18 +1003,25 @@ impl Dynamic {
///
/// Constant [`Dynamic`] values are read-only.
///
/// If a [`&mut Dynamic`][Dynamic] to such a constant is passed to a Rust function, the function
/// can use this information to return an error of
/// [`ErrorAssignmentToConstant`][crate::EvalAltResult::ErrorAssignmentToConstant] if its value
/// is going to be modified.
/// # Usage
///
/// This safe-guards constant values from being modified from within Rust functions.
/// If a [`&mut Dynamic`][Dynamic] to such a constant is passed to a Rust function, the function
/// can use this information to return the error
/// [`ErrorAssignmentToConstant`][crate::EvalAltResult::ErrorAssignmentToConstant] if its value
/// will be modified.
///
/// This safe-guards constant values from being modified within Rust functions.
///
/// # Shared Values
///
/// If a [`Dynamic`] holds a _shared_ value, then it is read-only only if the shared value
/// itself is read-only.
#[must_use]
pub fn is_read_only(&self) -> bool {
#[cfg(not(feature = "no_closure"))]
match self.0 {
Union::Shared(.., ReadOnly) => return true,
// Shared values do not consider the current access mode
//Union::Shared(.., ReadOnly) => return true,
Union::Shared(ref cell, ..) => {
return match locked_read(cell).access_mode() {
ReadWrite => false,