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

Disallow registering indexers for integers.

Browse Source
This commit is contained in:
Stephen Chung 2021-06-04 14:23:30 +08:00
parent 99e06abd94
commit e35122ae5d
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/engine_api.rs
View File

@ -538,8 +538,9 @@ impl Engine {
/// ///
/// # Panics /// # Panics
/// ///
/// Panics if the type is [`Array`], [`Map`], [`String`], [`ImmutableString`][crate::ImmutableString] or `&str`. /// Panics if the type is [`Array`], [`Map`], [`String`],
/// Indexers for arrays, object maps and strings cannot be registered. /// [`ImmutableString`][crate::ImmutableString], `&str` or [`INT`][crate::INT].
/// Indexers for arrays, object maps, strings and integers cannot be registered.
/// ///
/// # Example /// # Example
/// ///
@ -595,6 +596,9 @@ impl Engine {
{ {
panic!("Cannot register indexer for strings."); panic!("Cannot register indexer for strings.");
} }
if TypeId::of::<T>() == TypeId::of::<crate::INT>() {
panic!("Cannot register indexer for integers.");
}
self.register_fn(crate::engine::FN_IDX_GET, get_fn) self.register_fn(crate::engine::FN_IDX_GET, get_fn)
} }
@ -606,8 +610,9 @@ impl Engine {
/// ///
/// # Panics /// # Panics
/// ///
/// Panics if the type is [`Array`], [`Map`], [`String`], [`ImmutableString`][crate::ImmutableString] or `&str`. /// Panics if the type is [`Array`], [`Map`], [`String`],
/// Indexers for arrays, object maps and strings cannot be registered. /// [`ImmutableString`][crate::ImmutableString], `&str` or [`INT`][crate::INT].
/// Indexers for arrays, object maps, strings and integers cannot be registered.
/// ///
/// # Example /// # Example
/// ///
@ -669,6 +674,9 @@ impl Engine {
{ {
panic!("Cannot register indexer for strings."); panic!("Cannot register indexer for strings.");
} }
if TypeId::of::<T>() == TypeId::of::<crate::INT>() {
panic!("Cannot register indexer for integers.");
}
self.register_result_fn(crate::engine::FN_IDX_GET, get_fn) self.register_result_fn(crate::engine::FN_IDX_GET, get_fn)
} }
@ -678,8 +686,9 @@ impl Engine {
/// ///
/// # Panics /// # Panics
/// ///
/// Panics if the type is [`Array`], [`Map`], [`String`], [`ImmutableString`][crate::ImmutableString] or `&str`. /// Panics if the type is [`Array`], [`Map`], [`String`],
/// Indexers for arrays, object maps and strings cannot be registered. /// [`ImmutableString`][crate::ImmutableString], `&str` or [`INT`][crate::INT].
/// Indexers for arrays, object maps, strings and integers cannot be registered.
/// ///
/// # Example /// # Example
/// ///
@ -737,6 +746,9 @@ impl Engine {
{ {
panic!("Cannot register indexer for strings."); panic!("Cannot register indexer for strings.");
} }
if TypeId::of::<T>() == TypeId::of::<crate::INT>() {
panic!("Cannot register indexer for integers.");
}
self.register_fn(crate::engine::FN_IDX_SET, set_fn) self.register_fn(crate::engine::FN_IDX_SET, set_fn)
} }
@ -746,8 +758,9 @@ impl Engine {
/// ///
/// # Panics /// # Panics
/// ///
/// Panics if the type is [`Array`], [`Map`], [`String`], [`ImmutableString`][crate::ImmutableString] or `&str`. /// Panics if the type is [`Array`], [`Map`], [`String`],
/// Indexers for arrays, object maps and strings cannot be registered. /// [`ImmutableString`][crate::ImmutableString], `&str` or [`INT`][crate::INT].
/// Indexers for arrays, object maps, strings and integers cannot be registered.
/// ///
/// # Example /// # Example
/// ///
@ -812,6 +825,9 @@ impl Engine {
{ {
panic!("Cannot register indexer for strings."); panic!("Cannot register indexer for strings.");
} }
if TypeId::of::<T>() == TypeId::of::<crate::INT>() {
panic!("Cannot register indexer for integers.");
}
self.register_result_fn(crate::engine::FN_IDX_SET, set_fn) self.register_result_fn(crate::engine::FN_IDX_SET, set_fn)
} }
@ -821,8 +837,9 @@ impl Engine {
/// ///
/// # Panics /// # Panics
/// ///
/// Panics if the type is [`Array`], [`Map`], [`String`], [`ImmutableString`][crate::ImmutableString] or `&str`. /// Panics if the type is [`Array`], [`Map`], [`String`],
/// Indexers for arrays, object maps and strings cannot be registered. /// [`ImmutableString`][crate::ImmutableString], `&str` or [`INT`][crate::INT].
/// Indexers for arrays, object maps, strings and integers cannot be registered.
/// ///
/// # Example /// # Example
/// ///
@ -1876,7 +1893,7 @@ impl Engine {
scope: &mut Scope, scope: &mut Scope,
ast: &AST, ast: &AST,
name: impl AsRef<str>, name: impl AsRef<str>,
args: impl crate::fn_args::FuncArgs, args: impl crate::FuncArgs,
) -> Result<T, Box<EvalAltResult>> { ) -> Result<T, Box<EvalAltResult>> {
let mut arg_values: crate::StaticVec<_> = Default::default(); let mut arg_values: crate::StaticVec<_> = Default::default();
args.parse(&mut arg_values); args.parse(&mut arg_values);
@ -1886,14 +1903,14 @@ impl Engine {
let typ = self.map_type_name(result.type_name()); let typ = self.map_type_name(result.type_name());
return result.try_cast().ok_or_else(|| { result.try_cast().ok_or_else(|| {
EvalAltResult::ErrorMismatchOutputType( EvalAltResult::ErrorMismatchOutputType(
self.map_type_name(type_name::<T>()).into(), self.map_type_name(type_name::<T>()).into(),
typ.into(), typ.into(),
Position::NONE, Position::NONE,
) )
.into() .into()
}); })
} }
/// Call a script function defined in an [`AST`] with multiple [`Dynamic`] arguments /// Call a script function defined in an [`AST`] with multiple [`Dynamic`] arguments
/// and optionally a value for binding to the `this` pointer. /// and optionally a value for binding to the `this` pointer.