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

Merge pull request #420 from schungx/master

Browse Source 
Prepare for 0.20.3.
This commit is contained in:
Stephen Chung 2021-06-22 22:44:15 +08:00 committed by GitHub
commit 60069424c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 256 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -4,6 +4,8 @@ Rhai Release Notes
Version 0.20.3 Version 0.20.3
============== ==============
This version adds support to index into an integer number, treating it as a bit-field.
Bug fixes Bug fixes
--------- ---------
@ -13,7 +15,7 @@ Bug fixes
Breaking changes Breaking changes
---------------- ----------------
* To keep the API consistent, strings are no longer iterable by default. Use the `chars` method to iterator the characters in a string. * To keep the API consistent, strings are no longer iterable by default. Use the `chars` method to iterate through the characters in a string.
* `Dynamic::take_string` and `Dynamic::take_immutable_string` are renamed to `Dynamic::as_string` and `Dynamic::as_immutable_string` respectively. * `Dynamic::take_string` and `Dynamic::take_immutable_string` are renamed to `Dynamic::as_string` and `Dynamic::as_immutable_string` respectively.
New features New features

2
Cargo.toml
View File

@ -20,7 +20,7 @@ smallvec = { version = "1.6", default-features = false, features = ["union"] }
ahash = { version = "0.7", default-features = false } ahash = { version = "0.7", default-features = false }
num-traits = { version = "0.2", default-features = false } num-traits = { version = "0.2", default-features = false }
smartstring = { version = "0.2.6", default-features = false } smartstring = { version = "0.2.6", default-features = false }
rhai_codegen = { version = "0.4.0", path = "codegen", default-features = false } rhai_codegen = { version = ">=0.4.0", path = "codegen", default-features = false }
[features] [features]
default = ["smartstring/std", "ahash/std", "num-traits/std"] # remove 'smartstring/std' when smartstring is updated to support no-std default = ["smartstring/std", "ahash/std", "num-traits/std"] # remove 'smartstring/std' when smartstring is updated to support no-std

2
README.md
View File

@ -38,7 +38,7 @@ Standard features
* Freely pass Rust values into a script as [variables](https://rhai.rs/book/language/variables.html)/[constants](https://rhai.rs/book/language/constants.html) via an external [`Scope`](https://rhai.rs/book/rust/scope.html) - all clonable Rust types are supported; no need to implement any special trait. Or tap directly into the [variable resolution process](https://rhai.rs/book/engine/var.html). * Freely pass Rust values into a script as [variables](https://rhai.rs/book/language/variables.html)/[constants](https://rhai.rs/book/language/constants.html) via an external [`Scope`](https://rhai.rs/book/rust/scope.html) - all clonable Rust types are supported; no need to implement any special trait. Or tap directly into the [variable resolution process](https://rhai.rs/book/engine/var.html).
* Built-in support for most common [data types](https://rhai.rs/book/language/values-and-types.html) including booleans, [integers](https://rhai.rs/book/language/numbers.html), [floating-point numbers](https://rhai.rs/book/language/numbers.html) (including [`Decimal`](https://crates.io/crates/rust_decimal)), [strings](https://rhai.rs/book/language/strings-chars.html), [Unicode characters](https://rhai.rs/book/language/strings-chars.html), [arrays](https://rhai.rs/book/language/arrays.html) and [object maps](https://rhai.rs/book/language/object-maps.html). * Built-in support for most common [data types](https://rhai.rs/book/language/values-and-types.html) including booleans, [integers](https://rhai.rs/book/language/numbers.html), [floating-point numbers](https://rhai.rs/book/language/numbers.html) (including [`Decimal`](https://crates.io/crates/rust_decimal)), [strings](https://rhai.rs/book/language/strings-chars.html), [Unicode characters](https://rhai.rs/book/language/strings-chars.html), [arrays](https://rhai.rs/book/language/arrays.html) and [object maps](https://rhai.rs/book/language/object-maps.html).
* Easily [call a script-defined function](https://rhai.rs/book/engine/call-fn.html) from Rust. * Easily [call a script-defined function](https://rhai.rs/book/engine/call-fn.html) from Rust.
* Relatively little `unsafe` code (yes there are some for performance reasons), and `unsafe` code is only used for type casting, never to get around the borrow checker. * Relatively little `unsafe` code (yes there are some for performance reasons).
* Few dependencies - currently only [`smallvec`](https://crates.io/crates/smallvec), [`num-traits`](https://crates.io/crates/num-traits), [`ahash`](https://crates.io/crates/ahash) and [`smartstring`](https://crates.io/crates/smartstring). * Few dependencies - currently only [`smallvec`](https://crates.io/crates/smallvec), [`num-traits`](https://crates.io/crates/num-traits), [`ahash`](https://crates.io/crates/ahash) and [`smartstring`](https://crates.io/crates/smartstring).
* Re-entrant scripting engine can be made `Send + Sync` (via the `sync` feature). * Re-entrant scripting engine can be made `Send + Sync` (via the `sync` feature).
* Compile once to [AST](https://rhai.rs/book/engine/compile.html) form for repeated evaluations. * Compile once to [AST](https://rhai.rs/book/engine/compile.html) form for repeated evaluations.

4
src/ast.rs
View File

@ -1498,12 +1498,12 @@ impl fmt::Debug for FnCallHashes {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
if let Some(script) = self.script { if let Some(script) = self.script {
if script == self.native { if script == self.native {
write!(f, "({}=={})", script, self.native) fmt::Debug::fmt(&self.native, f)
} else { } else {
write!(f, "({}, {})", script, self.native) write!(f, "({}, {})", script, self.native)
} }
} else { } else {
write!(f, "{}", self.native) write!(f, "{} (native only)", self.native)
} }
} }
} }

2
src/engine.rs
View File

@ -95,7 +95,7 @@ impl Imports {
.iter() .iter()
.enumerate() .enumerate()
.rev() .rev()
.find_map(|(i, key)| if *key == name { Some(i) } else { None }) .find_map(|(i, key)| if key == name { Some(i) } else { None })
} }
/// Push an imported [modules][Module] onto the stack. /// Push an imported [modules][Module] onto the stack.
#[inline(always)] #[inline(always)]

472
src/fn_builtin.rs
View File

@ -76,75 +76,55 @@ pub fn get_builtin_binary_op_fn(
let types_pair = (type1, type2); let types_pair = (type1, type2);
macro_rules! impl_op { macro_rules! impl_op {
($xx:ident $op:tt $yy:ident) => { ($xx:ident $op:tt $yy:ident) => { |_, args| {
Some(|_, args| { let x = &*args[0].read_lock::<$xx>().expect(BUILTIN);
let x = &*args[0].read_lock::<$xx>().expect(BUILTIN); let y = &*args[1].read_lock::<$yy>().expect(BUILTIN);
let y = &*args[1].read_lock::<$yy>().expect(BUILTIN); Ok((x $op y).into())
Ok((x $op y).into()) } };
}) ($xx:ident . $func:ident ( $yy:ty )) => { |_, args| {
}; let x = &*args[0].read_lock::<$xx>().expect(BUILTIN);
($xx:ident . $func:ident ( $yy:ty )) => { let y = &*args[1].read_lock::<$yy>().expect(BUILTIN);
Some(|_, args| { Ok(x.$func(y).into())
let x = &*args[0].read_lock::<$xx>().expect(BUILTIN); } };
let y = &*args[1].read_lock::<$yy>().expect(BUILTIN); ($xx:ident . $func:ident ( $yy:ident . $yyy:ident () )) => { |_, args| {
Ok(x.$func(y).into()) let x = &*args[0].read_lock::<$xx>().expect(BUILTIN);
}) let y = &*args[1].read_lock::<$yy>().expect(BUILTIN);
}; Ok(x.$func(y.$yyy()).into())
($xx:ident . $func:ident ( $yy:ident . $yyy:ident () )) => { } };
Some(|_, args| { ($func:ident ( $op:tt )) => { |_, args| {
let x = &*args[0].read_lock::<$xx>().expect(BUILTIN); let (x, y) = $func(args);
let y = &*args[1].read_lock::<$yy>().expect(BUILTIN); Ok((x $op y).into())
Ok(x.$func(y.$yyy()).into()) } };
}) ($base:ty => $xx:ident $op:tt $yy:ident) => { |_, args| {
}; let x = args[0].$xx().expect(BUILTIN) as $base;
($func:ident ( $op:tt )) => { let y = args[1].$yy().expect(BUILTIN) as $base;
Some(|_, args| { Ok((x $op y).into())
let (x, y) = $func(args); } };
Ok((x $op y).into()) ($base:ty => $xx:ident . $func:ident ( $yy:ident as $yyy:ty)) => { |_, args| {
}) let x = args[0].$xx().expect(BUILTIN) as $base;
}; let y = args[1].$yy().expect(BUILTIN) as $base;
($base:ty => $xx:ident $op:tt $yy:ident) => { Ok(x.$func(y as $yyy).into())
Some(|_, args| { } };
let x = args[0].$xx().expect(BUILTIN) as $base; ($base:ty => $func:ident ( $xx:ident, $yy:ident )) => { |_, args| {
let y = args[1].$yy().expect(BUILTIN) as $base; let x = args[0].$xx().expect(BUILTIN) as $base;
Ok((x $op y).into()) let y = args[1].$yy().expect(BUILTIN) as $base;
}) $func(x, y).map(Into::<Dynamic>::into)
}; } };
($base:ty => $xx:ident . $func:ident ( $yy:ident as $yyy:ty)) => { (from $base:ty => $xx:ident $op:tt $yy:ident) => { |_, args| {
Some(|_, args| { let x = <$base>::from(args[0].$xx().expect(BUILTIN));
let x = args[0].$xx().expect(BUILTIN) as $base; let y = <$base>::from(args[1].$yy().expect(BUILTIN));
let y = args[1].$yy().expect(BUILTIN) as $base; Ok((x $op y).into())
Ok(x.$func(y as $yyy).into()) } };
}) (from $base:ty => $xx:ident . $func:ident ( $yy:ident )) => { |_, args| {
}; let x = <$base>::from(args[0].$xx().expect(BUILTIN));
($base:ty => $func:ident ( $xx:ident, $yy:ident )) => { let y = <$base>::from(args[1].$yy().expect(BUILTIN));
Some(|_, args| { Ok(x.$func(y).into())
let x = args[0].$xx().expect(BUILTIN) as $base; } };
let y = args[1].$yy().expect(BUILTIN) as $base; (from $base:ty => $func:ident ( $xx:ident, $yy:ident )) => { |_, args| {
$func(x, y).map(Into::<Dynamic>::into) let x = <$base>::from(args[0].$xx().expect(BUILTIN));
}) let y = <$base>::from(args[1].$yy().expect(BUILTIN));
}; $func(x, y).map(Into::<Dynamic>::into)
(from $base:ty => $xx:ident $op:tt $yy:ident) => { } };
Some(|_, args| {
let x = <$base>::from(args[0].$xx().expect(BUILTIN));
let y = <$base>::from(args[1].$yy().expect(BUILTIN));
Ok((x $op y).into())
})
};
(from $base:ty => $xx:ident . $func:ident ( $yy:ident )) => {
Some(|_, args| {
let x = <$base>::from(args[0].$xx().expect(BUILTIN));
let y = <$base>::from(args[1].$yy().expect(BUILTIN));
Ok(x.$func(y).into())
})
};
(from $base:ty => $func:ident ( $xx:ident, $yy:ident )) => {
Some(|_, args| {
let x = <$base>::from(args[0].$xx().expect(BUILTIN));
let y = <$base>::from(args[1].$yy().expect(BUILTIN));
$func(x, y).map(Into::<Dynamic>::into)
})
};
} }
macro_rules! impl_float { macro_rules! impl_float {
@ -152,18 +132,18 @@ pub fn get_builtin_binary_op_fn(
#[cfg(not(feature = "no_float"))] #[cfg(not(feature = "no_float"))]
if types_pair == (TypeId::of::<$x>(), TypeId::of::<$y>()) { if types_pair == (TypeId::of::<$x>(), TypeId::of::<$y>()) {
return match op { return match op {
"+" => impl_op!(FLOAT => $xx + $yy), "+" => Some(impl_op!(FLOAT => $xx + $yy)),
"-" => impl_op!(FLOAT => $xx - $yy), "-" => Some(impl_op!(FLOAT => $xx - $yy)),
"*" => impl_op!(FLOAT => $xx * $yy), "*" => Some(impl_op!(FLOAT => $xx * $yy)),
"/" => impl_op!(FLOAT => $xx / $yy), "/" => Some(impl_op!(FLOAT => $xx / $yy)),
"%" => impl_op!(FLOAT => $xx % $yy), "%" => Some(impl_op!(FLOAT => $xx % $yy)),
"**" => impl_op!(FLOAT => $xx.powf($yy as FLOAT)), "**" => Some(impl_op!(FLOAT => $xx.powf($yy as FLOAT))),
"==" => impl_op!(FLOAT => $xx == $yy), "==" => Some(impl_op!(FLOAT => $xx == $yy)),
"!=" => impl_op!(FLOAT => $xx != $yy), "!=" => Some(impl_op!(FLOAT => $xx != $yy)),
">" => impl_op!(FLOAT => $xx > $yy), ">" => Some(impl_op!(FLOAT => $xx > $yy)),
">=" => impl_op!(FLOAT => $xx >= $yy), ">=" => Some(impl_op!(FLOAT => $xx >= $yy)),
"<" => impl_op!(FLOAT => $xx < $yy), "<" => Some(impl_op!(FLOAT => $xx < $yy)),
"<=" => impl_op!(FLOAT => $xx <= $yy), "<=" => Some(impl_op!(FLOAT => $xx <= $yy)),
_ => None, _ => None,
}; };
} }
@ -183,12 +163,12 @@ pub fn get_builtin_binary_op_fn(
#[cfg(not(feature = "unchecked"))] #[cfg(not(feature = "unchecked"))]
match op { match op {
"+" => return impl_op!(from Decimal => add($xx, $yy)), "+" => return Some(impl_op!(from Decimal => add($xx, $yy))),
"-" => return impl_op!(from Decimal => subtract($xx, $yy)), "-" => return Some(impl_op!(from Decimal => subtract($xx, $yy))),
"*" => return impl_op!(from Decimal => multiply($xx, $yy)), "*" => return Some(impl_op!(from Decimal => multiply($xx, $yy))),
"/" => return impl_op!(from Decimal => divide($xx, $yy)), "/" => return Some(impl_op!(from Decimal => divide($xx, $yy))),
"%" => return impl_op!(from Decimal => modulo($xx, $yy)), "%" => return Some(impl_op!(from Decimal => modulo($xx, $yy))),
"**" => return impl_op!(from Decimal => power($xx, $yy)), "**" => return Some(impl_op!(from Decimal => power($xx, $yy))),
_ => () _ => ()
} }
@ -197,22 +177,22 @@ pub fn get_builtin_binary_op_fn(
#[cfg(feature = "unchecked")] #[cfg(feature = "unchecked")]
match op { match op {
"+" => return impl_op!(from Decimal => $xx + $yy), "+" => return Some(impl_op!(from Decimal => $xx + $yy)),
"-" => return impl_op!(from Decimal => $xx - $yy), "-" => return Some(impl_op!(from Decimal => $xx - $yy)),
"*" => return impl_op!(from Decimal => $xx * $yy), "*" => return Some(impl_op!(from Decimal => $xx * $yy)),
"/" => return impl_op!(from Decimal => $xx / $yy), "/" => return Some(impl_op!(from Decimal => $xx / $yy)),
"%" => return impl_op!(from Decimal => $xx % $yy), "%" => return Some(impl_op!(from Decimal => $xx % $yy)),
"**" => return impl_op!(from Decimal => $xx.powd($yy)), "**" => return Some(impl_op!(from Decimal => $xx.powd($yy))),
_ => () _ => ()
} }
return match op { return match op {
"==" => impl_op!(from Decimal => $xx == $yy), "==" => Some(impl_op!(from Decimal => $xx == $yy)),
"!=" => impl_op!(from Decimal => $xx != $yy), "!=" => Some(impl_op!(from Decimal => $xx != $yy)),
">" => impl_op!(from Decimal => $xx > $yy), ">" => Some(impl_op!(from Decimal => $xx > $yy)),
">=" => impl_op!(from Decimal => $xx >= $yy), ">=" => Some(impl_op!(from Decimal => $xx >= $yy)),
"<" => impl_op!(from Decimal => $xx < $yy), "<" => Some(impl_op!(from Decimal => $xx < $yy)),
"<=" => impl_op!(from Decimal => $xx <= $yy), "<=" => Some(impl_op!(from Decimal => $xx <= $yy)),
_ => None _ => None
}; };
} }
@ -241,12 +221,12 @@ pub fn get_builtin_binary_op_fn(
let y = &*args[1].read_lock::<ImmutableString>().expect(BUILTIN); let y = &*args[1].read_lock::<ImmutableString>().expect(BUILTIN);
Ok(format!("{}{}", x, y).into()) Ok(format!("{}{}", x, y).into())
}), }),
"==" => impl_op!(get_s1s2(==)), "==" => Some(impl_op!(get_s1s2(==))),
"!=" => impl_op!(get_s1s2(!=)), "!=" => Some(impl_op!(get_s1s2(!=))),
">" => impl_op!(get_s1s2(>)), ">" => Some(impl_op!(get_s1s2(>))),
">=" => impl_op!(get_s1s2(>=)), ">=" => Some(impl_op!(get_s1s2(>=))),
"<" => impl_op!(get_s1s2(<)), "<" => Some(impl_op!(get_s1s2(<))),
"<=" => impl_op!(get_s1s2(<=)), "<=" => Some(impl_op!(get_s1s2(<=))),
_ => None, _ => None,
}; };
} }
@ -273,12 +253,12 @@ pub fn get_builtin_binary_op_fn(
let y = args[1].as_char().expect(BUILTIN); let y = args[1].as_char().expect(BUILTIN);
Ok((x - y).into()) Ok((x - y).into())
}), }),
"==" => impl_op!(get_s1s2(==)), "==" => Some(impl_op!(get_s1s2(==))),
"!=" => impl_op!(get_s1s2(!=)), "!=" => Some(impl_op!(get_s1s2(!=))),
">" => impl_op!(get_s1s2(>)), ">" => Some(impl_op!(get_s1s2(>))),
">=" => impl_op!(get_s1s2(>=)), ">=" => Some(impl_op!(get_s1s2(>=))),
"<" => impl_op!(get_s1s2(<)), "<" => Some(impl_op!(get_s1s2(<))),
"<=" => impl_op!(get_s1s2(<=)), "<=" => Some(impl_op!(get_s1s2(<=))),
OP_CONTAINS => Some(|_, args| { OP_CONTAINS => Some(|_, args| {
let s = &*args[0].read_lock::<ImmutableString>().expect(BUILTIN); let s = &*args[0].read_lock::<ImmutableString>().expect(BUILTIN);
let c = args[1].as_char().expect(BUILTIN); let c = args[1].as_char().expect(BUILTIN);
@ -294,7 +274,7 @@ pub fn get_builtin_binary_op_fn(
use crate::Map; use crate::Map;
return match op { return match op {
OP_CONTAINS => impl_op!(Map.contains_key(ImmutableString.as_str())), OP_CONTAINS => Some(impl_op!(Map.contains_key(ImmutableString.as_str()))),
_ => None, _ => None,
}; };
} }
@ -316,69 +296,69 @@ pub fn get_builtin_binary_op_fn(
#[cfg(not(feature = "unchecked"))] #[cfg(not(feature = "unchecked"))]
match op { match op {
"+" => return impl_op!(INT => add(as_int, as_int)), "+" => return Some(impl_op!(INT => add(as_int, as_int))),
"-" => return impl_op!(INT => subtract(as_int, as_int)), "-" => return Some(impl_op!(INT => subtract(as_int, as_int))),
"*" => return impl_op!(INT => multiply(as_int, as_int)), "*" => return Some(impl_op!(INT => multiply(as_int, as_int))),
"/" => return impl_op!(INT => divide(as_int, as_int)), "/" => return Some(impl_op!(INT => divide(as_int, as_int))),
"%" => return impl_op!(INT => modulo(as_int, as_int)), "%" => return Some(impl_op!(INT => modulo(as_int, as_int))),
"**" => return impl_op!(INT => power(as_int, as_int)), "**" => return Some(impl_op!(INT => power(as_int, as_int))),
">>" => return impl_op!(INT => shift_right(as_int, as_int)), ">>" => return Some(impl_op!(INT => shift_right(as_int, as_int))),
"<<" => return impl_op!(INT => shift_left(as_int, as_int)), "<<" => return Some(impl_op!(INT => shift_left(as_int, as_int))),
_ => (), _ => (),
} }
#[cfg(feature = "unchecked")] #[cfg(feature = "unchecked")]
match op { match op {
"+" => return impl_op!(INT => as_int + as_int), "+" => return Some(impl_op!(INT => as_int + as_int)),
"-" => return impl_op!(INT => as_int - as_int), "-" => return Some(impl_op!(INT => as_int - as_int)),
"*" => return impl_op!(INT => as_int * as_int), "*" => return Some(impl_op!(INT => as_int * as_int)),
"/" => return impl_op!(INT => as_int / as_int), "/" => return Some(impl_op!(INT => as_int / as_int)),
"%" => return impl_op!(INT => as_int % as_int), "%" => return Some(impl_op!(INT => as_int % as_int)),
"**" => return impl_op!(INT => as_int.pow(as_int as u32)), "**" => return Some(impl_op!(INT => as_int.pow(as_int as u32))),
">>" => return impl_op!(INT => as_int >> as_int), ">>" => return Some(impl_op!(INT => as_int >> as_int)),
"<<" => return impl_op!(INT => as_int << as_int), "<<" => return Some(impl_op!(INT => as_int << as_int)),
_ => (), _ => (),
} }
return match op { return match op {
"==" => impl_op!(INT => as_int == as_int), "==" => Some(impl_op!(INT => as_int == as_int)),
"!=" => impl_op!(INT => as_int != as_int), "!=" => Some(impl_op!(INT => as_int != as_int)),
">" => impl_op!(INT => as_int > as_int), ">" => Some(impl_op!(INT => as_int > as_int)),
">=" => impl_op!(INT => as_int >= as_int), ">=" => Some(impl_op!(INT => as_int >= as_int)),
"<" => impl_op!(INT => as_int < as_int), "<" => Some(impl_op!(INT => as_int < as_int)),
"<=" => impl_op!(INT => as_int <= as_int), "<=" => Some(impl_op!(INT => as_int <= as_int)),
"&" => impl_op!(INT => as_int & as_int), "&" => Some(impl_op!(INT => as_int & as_int)),
"|" => impl_op!(INT => as_int | as_int), "|" => Some(impl_op!(INT => as_int | as_int)),
"^" => impl_op!(INT => as_int ^ as_int), "^" => Some(impl_op!(INT => as_int ^ as_int)),
_ => None, _ => None,
}; };
} }
if type1 == TypeId::of::<bool>() { if type1 == TypeId::of::<bool>() {
return match op { return match op {
"==" => impl_op!(bool => as_bool == as_bool), "==" => Some(impl_op!(bool => as_bool == as_bool)),
"!=" => impl_op!(bool => as_bool != as_bool), "!=" => Some(impl_op!(bool => as_bool != as_bool)),
">" => impl_op!(bool => as_bool > as_bool), ">" => Some(impl_op!(bool => as_bool > as_bool)),
">=" => impl_op!(bool => as_bool >= as_bool), ">=" => Some(impl_op!(bool => as_bool >= as_bool)),
"<" => impl_op!(bool => as_bool < as_bool), "<" => Some(impl_op!(bool => as_bool < as_bool)),
"<=" => impl_op!(bool => as_bool <= as_bool), "<=" => Some(impl_op!(bool => as_bool <= as_bool)),
"&" => impl_op!(bool => as_bool & as_bool), "&" => Some(impl_op!(bool => as_bool & as_bool)),
"|" => impl_op!(bool => as_bool | as_bool), "|" => Some(impl_op!(bool => as_bool | as_bool)),
"^" => impl_op!(bool => as_bool ^ as_bool), "^" => Some(impl_op!(bool => as_bool ^ as_bool)),
_ => None, _ => None,
}; };
} }
if type1 == TypeId::of::<ImmutableString>() { if type1 == TypeId::of::<ImmutableString>() {
return match op { return match op {
"+" => impl_op!(ImmutableString + ImmutableString), "+" => Some(impl_op!(ImmutableString + ImmutableString)),
"-" => impl_op!(ImmutableString - ImmutableString), "-" => Some(impl_op!(ImmutableString - ImmutableString)),
"==" => impl_op!(ImmutableString == ImmutableString), "==" => Some(impl_op!(ImmutableString == ImmutableString)),
"!=" => impl_op!(ImmutableString != ImmutableString), "!=" => Some(impl_op!(ImmutableString != ImmutableString)),
">" => impl_op!(ImmutableString > ImmutableString), ">" => Some(impl_op!(ImmutableString > ImmutableString)),
">=" => impl_op!(ImmutableString >= ImmutableString), ">=" => Some(impl_op!(ImmutableString >= ImmutableString)),
"<" => impl_op!(ImmutableString < ImmutableString), "<" => Some(impl_op!(ImmutableString < ImmutableString)),
"<=" => impl_op!(ImmutableString <= ImmutableString), "<=" => Some(impl_op!(ImmutableString <= ImmutableString)),
OP_CONTAINS => Some(|_, args| { OP_CONTAINS => Some(|_, args| {
let s1 = &*args[0].read_lock::<ImmutableString>().expect(BUILTIN); let s1 = &*args[0].read_lock::<ImmutableString>().expect(BUILTIN);
let s2 = &*args[1].read_lock::<ImmutableString>().expect(BUILTIN); let s2 = &*args[1].read_lock::<ImmutableString>().expect(BUILTIN);
@ -395,12 +375,12 @@ pub fn get_builtin_binary_op_fn(
let y = args[1].as_char().expect(BUILTIN); let y = args[1].as_char().expect(BUILTIN);
Ok(format!("{}{}", x, y).into()) Ok(format!("{}{}", x, y).into())
}), }),
"==" => impl_op!(char => as_char == as_char), "==" => Some(impl_op!(char => as_char == as_char)),
"!=" => impl_op!(char => as_char != as_char), "!=" => Some(impl_op!(char => as_char != as_char)),
">" => impl_op!(char => as_char > as_char), ">" => Some(impl_op!(char => as_char > as_char)),
">=" => impl_op!(char => as_char >= as_char), ">=" => Some(impl_op!(char => as_char >= as_char)),
"<" => impl_op!(char => as_char < as_char), "<" => Some(impl_op!(char => as_char < as_char)),
"<=" => impl_op!(char => as_char <= as_char), "<=" => Some(impl_op!(char => as_char <= as_char)),
_ => None, _ => None,
}; };
} }
@ -433,59 +413,43 @@ pub fn get_builtin_op_assignment_fn(
let types_pair = (type1, type2); let types_pair = (type1, type2);
macro_rules! impl_op { macro_rules! impl_op {
($x:ty = x $op:tt $yy:ident) => { ($x:ty = x $op:tt $yy:ident) => { |_, args| {
Some(|_, args| { let x = args[0].$yy().expect(BUILTIN);
let x = args[0].$yy().expect(BUILTIN); let y = args[1].$yy().expect(BUILTIN) as $x;
let y = args[1].$yy().expect(BUILTIN) as $x; Ok((*args[0].write_lock::<$x>().expect(BUILTIN) = x $op y).into())
Ok((*args[0].write_lock::<$x>().expect(BUILTIN) = x $op y).into()) } };
}) ($x:ident $op:tt $yy:ident) => { |_, args| {
}; let y = args[1].$yy().expect(BUILTIN) as $x;
($x:ident $op:tt $yy:ident) => { Ok((*args[0].write_lock::<$x>().expect(BUILTIN) $op y).into())
Some(|_, args| { } };
let y = args[1].$yy().expect(BUILTIN) as $x; ($x:ident $op:tt $yy:ident as $yyy:ty) => { |_, args| {
Ok((*args[0].write_lock::<$x>().expect(BUILTIN) $op y).into()) let y = args[1].$yy().expect(BUILTIN) as $yyy;
}) Ok((*args[0].write_lock::<$x>().expect(BUILTIN) $op y).into())
}; } };
($x:ident $op:tt $yy:ident as $yyy:ty) => { ($x:ty => $xx:ident . $func:ident ( $yy:ident as $yyy:ty )) => { |_, args| {
Some(|_, args| { let x = args[0].$xx().expect(BUILTIN);
let y = args[1].$yy().expect(BUILTIN) as $yyy; let y = args[1].$yy().expect(BUILTIN) as $x;
Ok((*args[0].write_lock::<$x>().expect(BUILTIN) $op y).into()) Ok((*args[0].write_lock::<$x>().expect(BUILTIN) = x.$func(y as $yyy)).into())
}) } };
}; ($x:ty => $func:ident ( $xx:ident, $yy:ident )) => { |_, args| {
($x:ty => $xx:ident . $func:ident ( $yy:ident as $yyy:ty )) => { let x = args[0].$xx().expect(BUILTIN);
Some(|_, args| { let y = args[1].$yy().expect(BUILTIN) as $x;
let x = args[0].$xx().expect(BUILTIN); Ok((*args[0].write_lock().expect(BUILTIN) = $func(x, y)?).into())
let y = args[1].$yy().expect(BUILTIN) as $x; } };
Ok((*args[0].write_lock::<$x>().expect(BUILTIN) = x.$func(y as $yyy)).into()) (from $x:ident $op:tt $yy:ident) => { |_, args| {
}) let y = <$x>::from(args[1].$yy().expect(BUILTIN));
}; Ok((*args[0].write_lock::<$x>().expect(BUILTIN) $op y).into())
($x:ty => $func:ident ( $xx:ident, $yy:ident )) => { } };
Some(|_, args| { (from $x:ty => $xx:ident . $func:ident ( $yy:ident )) => { |_, args| {
let x = args[0].$xx().expect(BUILTIN); let x = args[0].$xx().expect(BUILTIN);
let y = args[1].$yy().expect(BUILTIN) as $x; let y = <$x>::from(args[1].$yy().expect(BUILTIN));
Ok((*args[0].write_lock().expect(BUILTIN) = $func(x, y)?).into()) Ok((*args[0].write_lock::<$x>().expect(BUILTIN) = x.$func(y)).into())
}) } };
}; (from $x:ty => $func:ident ( $xx:ident, $yy:ident )) => { |_, args| {
(from $x:ident $op:tt $yy:ident) => { let x = args[0].$xx().expect(BUILTIN);
Some(|_, args| { let y = <$x>::from(args[1].$yy().expect(BUILTIN));
let y = <$x>::from(args[1].$yy().expect(BUILTIN)); Ok((*args[0].write_lock().expect(BUILTIN) = $func(x, y)?).into())
Ok((*args[0].write_lock::<$x>().expect(BUILTIN) $op y).into()) } };
})
};
(from $x:ty => $xx:ident . $func:ident ( $yy:ident )) => {
Some(|_, args| {
let x = args[0].$xx().expect(BUILTIN);
let y = <$x>::from(args[1].$yy().expect(BUILTIN));
Ok((*args[0].write_lock::<$x>().expect(BUILTIN) = x.$func(y)).into())
})
};
(from $x:ty => $func:ident ( $xx:ident, $yy:ident )) => {
Some(|_, args| {
let x = args[0].$xx().expect(BUILTIN);
let y = <$x>::from(args[1].$yy().expect(BUILTIN));
Ok((*args[0].write_lock().expect(BUILTIN) = $func(x, y)?).into())
})
};
} }
macro_rules! impl_float { macro_rules! impl_float {
@ -493,12 +457,12 @@ pub fn get_builtin_op_assignment_fn(
#[cfg(not(feature = "no_float"))] #[cfg(not(feature = "no_float"))]
if types_pair == (TypeId::of::<$x>(), TypeId::of::<$y>()) { if types_pair == (TypeId::of::<$x>(), TypeId::of::<$y>()) {
return match op { return match op {
"+=" => impl_op!($x += $yy), "+=" => Some(impl_op!($x += $yy)),
"-=" => impl_op!($x -= $yy), "-=" => Some(impl_op!($x -= $yy)),
"*=" => impl_op!($x *= $yy), "*=" => Some(impl_op!($x *= $yy)),
"/=" => impl_op!($x /= $yy), "/=" => Some(impl_op!($x /= $yy)),
"%=" => impl_op!($x %= $yy), "%=" => Some(impl_op!($x %= $yy)),
"**=" => impl_op!($x => $xx.powf($yy as $x)), "**=" => Some(impl_op!($x => $xx.powf($yy as $x))),
_ => None, _ => None,
}; };
} }
@ -517,12 +481,12 @@ pub fn get_builtin_op_assignment_fn(
#[cfg(not(feature = "unchecked"))] #[cfg(not(feature = "unchecked"))]
return match op { return match op {
"+=" => impl_op!(from $x => add($xx, $yy)), "+=" => Some(impl_op!(from $x => add($xx, $yy))),
"-=" => impl_op!(from $x => subtract($xx, $yy)), "-=" => Some(impl_op!(from $x => subtract($xx, $yy))),
"*=" => impl_op!(from $x => multiply($xx, $yy)), "*=" => Some(impl_op!(from $x => multiply($xx, $yy))),
"/=" => impl_op!(from $x => divide($xx, $yy)), "/=" => Some(impl_op!(from $x => divide($xx, $yy))),
"%=" => impl_op!(from $x => modulo($xx, $yy)), "%=" => Some(impl_op!(from $x => modulo($xx, $yy))),
"**=" => impl_op!(from $x => power($xx, $yy)), "**=" => Some(impl_op!(from $x => power($xx, $yy))),
_ => None, _ => None,
}; };
@ -531,12 +495,12 @@ pub fn get_builtin_op_assignment_fn(
#[cfg(feature = "unchecked")] #[cfg(feature = "unchecked")]
return match op { return match op {
"+=" => impl_op!(from $x += $yy), "+=" => Some(impl_op!(from $x += $yy)),
"-=" => impl_op!(from $x -= $yy), "-=" => Some(impl_op!(from $x -= $yy)),
"*=" => impl_op!(from $x *= $yy), "*=" => Some(impl_op!(from $x *= $yy)),
"/=" => impl_op!(from $x /= $yy), "/=" => Some(impl_op!(from $x /= $yy)),
"%=" => impl_op!(from $x %= $yy), "%=" => Some(impl_op!(from $x %= $yy)),
"**=" => impl_op!(from $x => $xx.powd($yy)), "**=" => Some(impl_op!(from $x => $xx.powd($yy))),
_ => None, _ => None,
}; };
} }
@ -549,8 +513,8 @@ pub fn get_builtin_op_assignment_fn(
// string op= char // string op= char
if types_pair == (TypeId::of::<ImmutableString>(), TypeId::of::<char>()) { if types_pair == (TypeId::of::<ImmutableString>(), TypeId::of::<char>()) {
return match op { return match op {
"+=" => impl_op!(ImmutableString += as_char as char), "+=" => Some(impl_op!(ImmutableString += as_char as char)),
"-=" => impl_op!(ImmutableString -= as_char as char), "-=" => Some(impl_op!(ImmutableString -= as_char as char)),
_ => None, _ => None,
}; };
} }
@ -585,42 +549,42 @@ pub fn get_builtin_op_assignment_fn(
#[cfg(not(feature = "unchecked"))] #[cfg(not(feature = "unchecked"))]
match op { match op {
"+=" => return impl_op!(INT => add(as_int, as_int)), "+=" => return Some(impl_op!(INT => add(as_int, as_int))),
"-=" => return impl_op!(INT => subtract(as_int, as_int)), "-=" => return Some(impl_op!(INT => subtract(as_int, as_int))),
"*=" => return impl_op!(INT => multiply(as_int, as_int)), "*=" => return Some(impl_op!(INT => multiply(as_int, as_int))),
"/=" => return impl_op!(INT => divide(as_int, as_int)), "/=" => return Some(impl_op!(INT => divide(as_int, as_int))),
"%=" => return impl_op!(INT => modulo(as_int, as_int)), "%=" => return Some(impl_op!(INT => modulo(as_int, as_int))),
"**=" => return impl_op!(INT => power(as_int, as_int)), "**=" => return Some(impl_op!(INT => power(as_int, as_int))),
">>=" => return impl_op!(INT => shift_right(as_int, as_int)), ">>=" => return Some(impl_op!(INT => shift_right(as_int, as_int))),
"<<=" => return impl_op!(INT => shift_left(as_int, as_int)), "<<=" => return Some(impl_op!(INT => shift_left(as_int, as_int))),
_ => (), _ => (),
} }
#[cfg(feature = "unchecked")] #[cfg(feature = "unchecked")]
match op { match op {
"+=" => return impl_op!(INT += as_int), "+=" => return Some(impl_op!(INT += as_int)),
"-=" => return impl_op!(INT -= as_int), "-=" => return Some(impl_op!(INT -= as_int)),
"*=" => return impl_op!(INT *= as_int), "*=" => return Some(impl_op!(INT *= as_int)),
"/=" => return impl_op!(INT /= as_int), "/=" => return Some(impl_op!(INT /= as_int)),
"%=" => return impl_op!(INT %= as_int), "%=" => return Some(impl_op!(INT %= as_int)),
"**=" => return impl_op!(INT => as_int.pow(as_int as u32)), "**=" => return Some(impl_op!(INT => as_int.pow(as_int as u32))),
">>=" => return impl_op!(INT >>= as_int), ">>=" => return Some(impl_op!(INT >>= as_int)),
"<<=" => return impl_op!(INT <<= as_int), "<<=" => return Some(impl_op!(INT <<= as_int)),
_ => (), _ => (),
} }
return match op { return match op {
"&=" => impl_op!(INT &= as_int), "&=" => Some(impl_op!(INT &= as_int)),
"|=" => impl_op!(INT |= as_int), "|=" => Some(impl_op!(INT |= as_int)),
"^=" => impl_op!(INT ^= as_int), "^=" => Some(impl_op!(INT ^= as_int)),
_ => None, _ => None,
}; };
} }
if type1 == TypeId::of::<bool>() { if type1 == TypeId::of::<bool>() {
return match op { return match op {
"&=" => impl_op!(bool = x && as_bool), "&=" => Some(impl_op!(bool = x && as_bool)),
"|=" => impl_op!(bool = x || as_bool), "|=" => Some(impl_op!(bool = x || as_bool)),
_ => None, _ => None,
}; };
} }

83
src/fn_call.rs
View File

@ -142,7 +142,7 @@ impl Engine {
.map(|a| if a.is::<ImmutableString>() { .map(|a| if a.is::<ImmutableString>() {
"&str | ImmutableString | String" "&str | ImmutableString | String"
} else { } else {
self.map_type_name((*a).type_name()) self.map_type_name(a.type_name())
}) })
.collect::<StaticVec<_>>() .collect::<StaticVec<_>>()
.join(", ") .join(", ")
@ -171,8 +171,10 @@ impl Engine {
is_op_assignment: bool, is_op_assignment: bool,
) -> &'s Option<Box<FnResolutionCacheEntry>> { ) -> &'s Option<Box<FnResolutionCacheEntry>> {
let mut hash = args.as_ref().map_or(hash_script, |args| { let mut hash = args.as_ref().map_or(hash_script, |args| {
let hash_params = calc_fn_params_hash(args.iter().map(|a| a.type_id())); combine_hashes(
combine_hashes(hash_script, hash_params) hash_script,
calc_fn_params_hash(args.iter().map(|a| a.type_id())),
)
}); });
&*state &*state
@ -188,43 +190,17 @@ impl Engine {
let mut bitmask = 1usize; // Bitmask of which parameter to replace with `Dynamic` let mut bitmask = 1usize; // Bitmask of which parameter to replace with `Dynamic`
loop { loop {
let func = lib let func = lib.iter().find_map(|m| m.get_fn(hash).cloned().map(|func| FnResolutionCacheEntry {
.iter() func, source: m.id_raw().cloned()
.find_map(|m| { })).or_else(|| self.global_namespace.get_fn(hash).cloned().map(|func| FnResolutionCacheEntry {
m.get_fn(hash).cloned().map(|func| { func, source: None
let source = m.id_raw().cloned(); })).or_else(|| self.global_modules.iter().find_map(|m| m.get_fn(hash).cloned().map(|func| FnResolutionCacheEntry {
FnResolutionCacheEntry { func, source } func, source: m.id_raw().cloned()
}) }))).or_else(|| mods.get_fn(hash).map(|(func, source)| FnResolutionCacheEntry {
}) func: func.clone(), source: source.cloned()
.or_else(|| { })).or_else(|| self.global_sub_modules.values().find_map(|m| m.get_qualified_fn(hash).cloned().map(|func| FnResolutionCacheEntry {
self.global_namespace func, source: m.id_raw().cloned()
.get_fn(hash) })));
.cloned()
.map(|func| FnResolutionCacheEntry { func, source: None })
})
.or_else(|| {
self.global_modules.iter().find_map(|m| {
m.get_fn(hash).cloned().map(|func| {
let source = m.id_raw().cloned();
FnResolutionCacheEntry { func, source }
})
})
})
.or_else(|| {
mods.get_fn(hash).map(|(func, source)| {
let func = func.clone();
let source = source.cloned();
FnResolutionCacheEntry { func, source }
})
})
.or_else(|| {
self.global_sub_modules.values().find_map(|m| {
m.get_qualified_fn(hash).cloned().map(|func| {
let source = m.id_raw().cloned();
FnResolutionCacheEntry { func, source }
})
})
});
match func { match func {
// Specific version found // Specific version found
@ -239,23 +215,17 @@ impl Engine {
return args.and_then(|args| { return args.and_then(|args| {
if !is_op_assignment { if !is_op_assignment {
get_builtin_binary_op_fn(fn_name, &args[0], &args[1]).map(|f| { get_builtin_binary_op_fn(fn_name, &args[0], &args[1]).map(|f| {
let func = CallableFunction::from_method( FnResolutionCacheEntry { func: CallableFunction::from_method(
Box::new(f) as Box<FnAny> Box::new(f) as Box<FnAny>
); ), source: None }
FnResolutionCacheEntry { func, source: None }
}) })
} else { } else {
let (first, second) = args.split_first() let (first, second) = args.split_first()
.expect("never fails because an op-assignment must have two arguments"); .expect("never fails because an op-assignment must have two arguments");
get_builtin_op_assignment_fn(fn_name, *first, second[0]).map( get_builtin_op_assignment_fn(fn_name, *first, second[0]).map(|f| FnResolutionCacheEntry {
|f| { func: CallableFunction::from_method(Box::new(f) as Box<FnAny>), source: None
let func = CallableFunction::from_method( })
Box::new(f) as Box<FnAny>
);
FnResolutionCacheEntry { func, source: None }
},
)
} }
.map(Box::new) .map(Box::new)
}); });
@ -437,11 +407,10 @@ impl Engine {
} }
// Raise error // Raise error
_ => EvalAltResult::ErrorFunctionNotFound( _ => {
self.gen_call_signature(None, name, args.as_ref()), EvalAltResult::ErrorFunctionNotFound(self.gen_call_signature(None, name, args), pos)
pos, .into()
) }
.into(),
} }
} }
@ -1451,7 +1420,7 @@ impl Engine {
Some(f) => unreachable!("unknown function type: {:?}", f), Some(f) => unreachable!("unknown function type: {:?}", f),
None => EvalAltResult::ErrorFunctionNotFound( None => EvalAltResult::ErrorFunctionNotFound(
self.gen_call_signature(Some(namespace), fn_name, args.as_ref()), self.gen_call_signature(Some(namespace), fn_name, &args),
pos, pos,
) )
.into(), .into(),

6
src/parse.rs
View File

@ -191,7 +191,7 @@ impl<'e> ParseState<'e> {
.iter() .iter()
.rev() .rev()
.enumerate() .enumerate()
.find(|&(_, n)| *n == name) .find(|&(_, n)| n == name)
.and_then(|(i, _)| NonZeroUsize::new(i + 1)) .and_then(|(i, _)| NonZeroUsize::new(i + 1))
} }
@ -1070,8 +1070,8 @@ fn parse_primary(
let (expr, func) = parse_anon_fn(input, &mut new_state, lib, settings)?; let (expr, func) = parse_anon_fn(input, &mut new_state, lib, settings)?;
#[cfg(not(feature = "no_closure"))] #[cfg(not(feature = "no_closure"))]
new_state.external_vars.iter().for_each(|(closure, pos)| { new_state.external_vars.iter().for_each(|(closure, &pos)| {
state.access_var(closure, *pos); state.access_var(closure, pos);
}); });
let hash_script = calc_fn_hash(&func.name, func.params.len()); let hash_script = calc_fn_hash(&func.name, func.params.len());

2
src/scope.rs
View File

@ -448,7 +448,7 @@ impl<'a> Scope<'a> {
.1 .1
.as_mut() .as_mut()
.expect("never fails because the list is initialized"); .expect("never fails because the list is initialized");
if !list.iter().any(|a| &alias == a) { if !list.iter().any(|a| a == &alias) {
list.push(alias); list.push(alias);
} }
self self