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

Dynamic::read renamed to Dynamic::clone_inner_data

Browse Source
This commit is contained in:
Ilya Lakhin 2020-07-31 13:10:05 +07:00
parent 89f75bbf0c
commit 5d1f5cc2b4
3 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/any.rs
View File

@ -709,6 +709,46 @@ impl Dynamic {
self.try_cast::<T>().unwrap()
}
/// Get a copy of a specific type to the `Dynamic`.
/// Casting to `Dynamic` returns a clone of the value in case of NON-shared
/// Dynamic. In case of Shared Dynamic returns a clone of the inner data of
/// Shared Dynamic.
/// Returns `None` if the cast fails.
#[inline(always)]
pub fn clone_inner_data<T: Variant + Clone>(&self) -> Option<T> {
match self.0 {
Union::Shared(ref cell) => {
let type_id = TypeId::of::<T>();
if type_id != TypeId::of::<Dynamic>() && cell.value_type_id != type_id {
return None
}
#[cfg(not(feature = "sync"))]
return Some(cell
.container
.borrow()
.deref()
.downcast_ref::<T>()
.unwrap()
.clone());
#[cfg(feature = "sync")]
return Some(cell
.container
.read()
.unwrap()
.deref()
.downcast_ref::<T>()
.unwrap()
.clone());
},
_ => {
self.downcast_ref().cloned()
}
}
}
/// Get a reference of a specific type to the `Dynamic`.
/// Casting to `Dynamic` just returns a reference to it.
/// Returns `None` if the cast fails.
@ -740,46 +780,6 @@ impl Dynamic {
}
}
/// Get a copy of a specific type to the `Dynamic`.
/// Casting to `Dynamic` returns a clone of the value in case of NON-shared
/// Dynamic. In case of Shared Dynamic returns a clone of the inner data of
/// Shared Dynamic.
/// Returns `None` if the cast fails.
#[inline(always)]
pub fn read<T: Variant + Clone>(&self) -> Option<T> {
match self.0 {
Union::Shared(ref cell) => {
let type_id = TypeId::of::<T>();
if type_id != TypeId::of::<Dynamic>() && cell.value_type_id != type_id {
return None
}
#[cfg(not(feature = "sync"))]
return Some(cell
.container
.borrow()
.deref()
.downcast_ref::<T>()
.unwrap()
.clone());
#[cfg(feature = "sync")]
return Some(cell
.container
.read()
.unwrap()
.deref()
.downcast_ref::<T>()
.unwrap()
.clone());
},
_ => {
self.downcast_ref().cloned()
}
}
}
/// Get a mutable reference of a specific type to the `Dynamic`.
/// Casting to `Dynamic` just returns a mutable reference to it.
/// Returns `None` if the cast fails.
@ -964,7 +964,7 @@ impl Dynamic {
pub fn as_int(&self) -> Result<INT, &'static str> {
match self.0 {
Union::Int(n) => Ok(n),
Union::Shared(_) => self.read::<INT>().ok_or_else(|| self.type_name()),
Union::Shared(_) => self.clone_inner_data::<INT>().ok_or_else(|| self.type_name()),
_ => Err(self.type_name()),
}
}
@ -975,7 +975,7 @@ impl Dynamic {
pub fn as_float(&self) -> Result<FLOAT, &'static str> {
match self.0 {
Union::Float(n) => Ok(n),
Union::Shared(_) => self.read::<FLOAT>().ok_or_else(|| self.type_name()),
Union::Shared(_) => self.clone_inner_data::<FLOAT>().ok_or_else(|| self.type_name()),
_ => Err(self.type_name()),
}
}
@ -985,7 +985,7 @@ impl Dynamic {
pub fn as_bool(&self) -> Result<bool, &'static str> {
match self.0 {
Union::Bool(b) => Ok(b),
Union::Shared(_) => self.read::<bool>().ok_or_else(|| self.type_name()),
Union::Shared(_) => self.clone_inner_data::<bool>().ok_or_else(|| self.type_name()),
_ => Err(self.type_name()),
}
}
@ -995,7 +995,7 @@ impl Dynamic {
pub fn as_char(&self) -> Result<char, &'static str> {
match self.0 {
Union::Char(n) => Ok(n),
Union::Shared(_) => self.read::<char>().ok_or_else(|| self.type_name()),
Union::Shared(_) => self.clone_inner_data::<char>().ok_or_else(|| self.type_name()),
_ => Err(self.type_name()),
}
}

2
src/fn_call.rs
View File

@ -658,7 +658,7 @@ impl Engine {
))
} else if _fn_name == KEYWORD_TAKE {
// take call
return Ok((obj.read::<Dynamic>().unwrap(), false));
return Ok((obj.clone_inner_data::<Dynamic>().unwrap(), false));
} else {
#[cfg(not(feature = "no_object"))]
let redirected;

2
src/scope.rs
View File

@ -340,7 +340,7 @@ impl<'a> Scope<'a> {
/// ```
pub fn get_value<T: Variant + Clone>(&self, name: &str) -> Option<T> {
self.get_entry(name)
.and_then(|Entry { value, .. }| value.read::<T>())
.and_then(|Entry { value, .. }| value.clone_inner_data::<T>())
}
/// Update the value of the named entry.