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

Use as_xxx() API.

Browse Source
This commit is contained in:
Stephen Chung 2021-03-03 13:16:53 +08:00
parent 2c8b15c740
commit 77277ebf37
2 changed files with 134 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dynamic.rs
View File

@ -1489,6 +1489,15 @@ impl Dynamic {
_ => Err(self.type_name()), _ => Err(self.type_name()),
} }
} }
/// Cast the [`Dynamic`] as an [`ImmutableString`] and return it.
/// Returns the name of the actual type if the cast fails.
#[inline]
pub(crate) fn as_locked_immutable_string<'a>(
&'a self,
) -> Result<impl Deref<Target = ImmutableString> + 'a, &'static str> {
self.read_lock::<ImmutableString>()
.ok_or_else(|| self.type_name())
}
/// Convert the [`Dynamic`] into a [`String`] and return it. /// Convert the [`Dynamic`] into a [`String`] and return it.
/// If there are other references to the same string, a cloned copy is returned. /// If there are other references to the same string, a cloned copy is returned.
/// Returns the name of the actual type if the cast fails. /// Returns the name of the actual type if the cast fails.
@ -1503,7 +1512,6 @@ impl Dynamic {
pub fn take_immutable_string(self) -> Result<ImmutableString, &'static str> { pub fn take_immutable_string(self) -> Result<ImmutableString, &'static str> {
match self.0 { match self.0 {
Union::Str(s, _) => Ok(s), Union::Str(s, _) => Ok(s),
Union::FnPtr(f, _) => Ok(f.take_data().0),
#[cfg(not(feature = "no_closure"))] #[cfg(not(feature = "no_closure"))]
Union::Shared(cell, _) => { Union::Shared(cell, _) => {
#[cfg(not(feature = "sync"))] #[cfg(not(feature = "sync"))]
@ -1513,7 +1521,6 @@ impl Dynamic {
match &data.0 { match &data.0 {
Union::Str(s, _) => Ok(s.clone()), Union::Str(s, _) => Ok(s.clone()),
Union::FnPtr(f, _) => Ok(f.get_fn_name().clone()),
_ => Err((*data).type_name()), _ => Err((*data).type_name()),
} }
} }

264
src/fn_builtin.rs
View File

@ -82,21 +82,18 @@ pub fn get_builtin_binary_op_fn(
if types_pair == (TypeId::of::<FLOAT>(), TypeId::of::<FLOAT>()) { if types_pair == (TypeId::of::<FLOAT>(), TypeId::of::<FLOAT>()) {
// FLOAT op FLOAT // FLOAT op FLOAT
( (args[0].as_float().unwrap(), args[1].as_float().unwrap())
args[0].clone().cast::<FLOAT>(),
args[1].clone().cast::<FLOAT>(),
)
} else if types_pair == (TypeId::of::<FLOAT>(), TypeId::of::<INT>()) { } else if types_pair == (TypeId::of::<FLOAT>(), TypeId::of::<INT>()) {
// FLOAT op INT // FLOAT op INT
( (
args[0].clone().cast::<FLOAT>(), args[0].as_float().unwrap(),
args[1].clone().cast::<INT>() as FLOAT, args[1].as_int().unwrap() as FLOAT,
) )
} else if types_pair == (TypeId::of::<INT>(), TypeId::of::<FLOAT>()) { } else if types_pair == (TypeId::of::<INT>(), TypeId::of::<FLOAT>()) {
// INT op FLOAT // INT op FLOAT
( (
args[0].clone().cast::<INT>() as FLOAT, args[0].as_int().unwrap() as FLOAT,
args[1].clone().cast::<FLOAT>(), args[1].as_float().unwrap(),
) )
} else { } else {
unreachable!() unreachable!()
@ -194,21 +191,18 @@ pub fn get_builtin_binary_op_fn(
if types_pair == (TypeId::of::<Decimal>(), TypeId::of::<Decimal>()) { if types_pair == (TypeId::of::<Decimal>(), TypeId::of::<Decimal>()) {
// Decimal op Decimal // Decimal op Decimal
( (args[0].as_decimal().unwrap(), args[1].as_decimal().unwrap())
args[0].clone().cast::<Decimal>(),
args[1].clone().cast::<Decimal>(),
)
} else if types_pair == (TypeId::of::<Decimal>(), TypeId::of::<INT>()) { } else if types_pair == (TypeId::of::<Decimal>(), TypeId::of::<INT>()) {
// Decimal op INT // Decimal op INT
( (
args[0].clone().cast::<Decimal>(), args[0].as_decimal().unwrap(),
Decimal::from(args[1].clone().cast::<INT>()), Decimal::from(args[1].as_int().unwrap()),
) )
} else if types_pair == (TypeId::of::<INT>(), TypeId::of::<Decimal>()) { } else if types_pair == (TypeId::of::<INT>(), TypeId::of::<Decimal>()) {
// INT op Decimal // INT op Decimal
( (
Decimal::from(args[0].clone().cast::<INT>()), Decimal::from(args[0].as_int().unwrap()),
args[1].clone().cast::<Decimal>(), args[1].as_decimal().unwrap(),
) )
} else { } else {
unreachable!() unreachable!()
@ -333,16 +327,16 @@ pub fn get_builtin_binary_op_fn(
match op { match op {
"+" => { "+" => {
return Some(|_, args| { return Some(|_, args| {
let x = args[0].clone().cast::<char>(); let x = args[0].as_char().unwrap();
let y = &*args[1].read_lock::<ImmutableString>().unwrap(); let y = &*args[1].as_locked_immutable_string().unwrap();
Ok(format!("{}{}", x, y).into()) Ok(format!("{}{}", x, y).into())
}) })
} }
"==" | "!=" | ">" | ">=" | "<" | "<=" => { "==" | "!=" | ">" | ">=" | "<" | "<=" => {
#[inline(always)] #[inline(always)]
fn get_s1s2(args: &FnCallArgs) -> ([char; 2], [char; 2]) { fn get_s1s2(args: &FnCallArgs) -> ([char; 2], [char; 2]) {
let x = args[0].clone().cast::<char>(); let x = args[0].as_char().unwrap();
let y = &*args[1].read_lock::<ImmutableString>().unwrap(); let y = &*args[1].as_locked_immutable_string().unwrap();
let s1 = [x, '\0']; let s1 = [x, '\0'];
let mut y = y.chars(); let mut y = y.chars();
let s2 = [y.next().unwrap_or('\0'), y.next().unwrap_or('\0')]; let s2 = [y.next().unwrap_or('\0'), y.next().unwrap_or('\0')];
@ -397,23 +391,23 @@ pub fn get_builtin_binary_op_fn(
match op { match op {
"+" => { "+" => {
return Some(|_, args| { return Some(|_, args| {
let x = &*args[0].read_lock::<ImmutableString>().unwrap(); let x = &*args[0].as_locked_immutable_string().unwrap();
let y = args[1].clone().cast::<char>(); let y = args[1].as_char().unwrap();
Ok((x + y).into()) Ok((x + y).into())
}) })
} }
"-" => { "-" => {
return Some(|_, args| { return Some(|_, args| {
let x = &*args[0].read_lock::<ImmutableString>().unwrap(); let x = &*args[0].as_locked_immutable_string().unwrap();
let y = args[1].clone().cast::<char>(); let y = args[1].as_char().unwrap();
Ok((x - y).into()) Ok((x - y).into())
}) })
} }
"==" | "!=" | ">" | ">=" | "<" | "<=" => { "==" | "!=" | ">" | ">=" | "<" | "<=" => {
#[inline(always)] #[inline(always)]
fn get_s1s2(args: &FnCallArgs) -> ([char; 2], [char; 2]) { fn get_s1s2(args: &FnCallArgs) -> ([char; 2], [char; 2]) {
let x = &*args[0].read_lock::<ImmutableString>().unwrap(); let x = &*args[0].as_locked_immutable_string().unwrap();
let y = args[1].clone().cast::<char>(); let y = args[1].as_char().unwrap();
let mut x = x.chars(); let mut x = x.chars();
let s1 = [x.next().unwrap_or('\0'), x.next().unwrap_or('\0')]; let s1 = [x.next().unwrap_or('\0'), x.next().unwrap_or('\0')];
let s2 = [y, '\0']; let s2 = [y, '\0'];
@ -478,8 +472,8 @@ pub fn get_builtin_binary_op_fn(
if type1 == TypeId::of::<INT>() { if type1 == TypeId::of::<INT>() {
#[inline(always)] #[inline(always)]
fn get_xy(args: &FnCallArgs) -> (INT, INT) { fn get_xy(args: &FnCallArgs) -> (INT, INT) {
let x = args[0].clone().cast::<INT>(); let x = args[0].as_int().unwrap();
let y = args[1].clone().cast::<INT>(); let y = args[1].as_int().unwrap();
(x, y) (x, y)
} }
@ -697,57 +691,57 @@ pub fn get_builtin_binary_op_fn(
match op { match op {
"+" => { "+" => {
return Some(|_, args| { return Some(|_, args| {
let x = &*args[0].read_lock::<ImmutableString>().unwrap(); let x = &*args[0].as_locked_immutable_string().unwrap();
let y = &*args[1].read_lock::<ImmutableString>().unwrap(); let y = &*args[1].as_locked_immutable_string().unwrap();
Ok((x + y).into()) Ok((x + y).into())
}) })
} }
"-" => { "-" => {
return Some(|_, args| { return Some(|_, args| {
let x = &*args[0].read_lock::<ImmutableString>().unwrap(); let x = &*args[0].as_locked_immutable_string().unwrap();
let y = &*args[1].read_lock::<ImmutableString>().unwrap(); let y = &*args[1].as_locked_immutable_string().unwrap();
Ok((x - y).into()) Ok((x - y).into())
}) })
} }
"==" => { "==" => {
return Some(|_, args| { return Some(|_, args| {
let x = &*args[0].read_lock::<ImmutableString>().unwrap(); let x = &*args[0].as_locked_immutable_string().unwrap();
let y = &*args[1].read_lock::<ImmutableString>().unwrap(); let y = &*args[1].as_locked_immutable_string().unwrap();
Ok((x == y).into()) Ok((x == y).into())
}) })
} }
"!=" => { "!=" => {
return Some(|_, args| { return Some(|_, args| {
let x = &*args[0].read_lock::<ImmutableString>().unwrap(); let x = &*args[0].as_locked_immutable_string().unwrap();
let y = &*args[1].read_lock::<ImmutableString>().unwrap(); let y = &*args[1].as_locked_immutable_string().unwrap();
Ok((x != y).into()) Ok((x != y).into())
}) })
} }
">" => { ">" => {
return Some(|_, args| { return Some(|_, args| {
let x = &*args[0].read_lock::<ImmutableString>().unwrap(); let x = &*args[0].as_locked_immutable_string().unwrap();
let y = &*args[1].read_lock::<ImmutableString>().unwrap(); let y = &*args[1].as_locked_immutable_string().unwrap();
Ok((x > y).into()) Ok((x > y).into())
}) })
} }
">=" => { ">=" => {
return Some(|_, args| { return Some(|_, args| {
let x = &*args[0].read_lock::<ImmutableString>().unwrap(); let x = &*args[0].as_locked_immutable_string().unwrap();
let y = &*args[1].read_lock::<ImmutableString>().unwrap(); let y = &*args[1].as_locked_immutable_string().unwrap();
Ok((x >= y).into()) Ok((x >= y).into())
}) })
} }
"<" => { "<" => {
return Some(|_, args| { return Some(|_, args| {
let x = &*args[0].read_lock::<ImmutableString>().unwrap(); let x = &*args[0].as_locked_immutable_string().unwrap();
let y = &*args[1].read_lock::<ImmutableString>().unwrap(); let y = &*args[1].as_locked_immutable_string().unwrap();
Ok((x < y).into()) Ok((x < y).into())
}) })
} }
"<=" => { "<=" => {
return Some(|_, args| { return Some(|_, args| {
let x = &*args[0].read_lock::<ImmutableString>().unwrap(); let x = &*args[0].as_locked_immutable_string().unwrap();
let y = &*args[1].read_lock::<ImmutableString>().unwrap(); let y = &*args[1].as_locked_immutable_string().unwrap();
Ok((x <= y).into()) Ok((x <= y).into())
}) })
} }
@ -758,8 +752,8 @@ pub fn get_builtin_binary_op_fn(
if type1 == TypeId::of::<char>() { if type1 == TypeId::of::<char>() {
#[inline(always)] #[inline(always)]
fn get_xy(args: &FnCallArgs) -> (char, char) { fn get_xy(args: &FnCallArgs) -> (char, char) {
let x = args[0].clone().cast::<char>(); let x = args[0].as_char().unwrap();
let y = args[1].clone().cast::<char>(); let y = args[1].as_char().unwrap();
(x, y) (x, y)
} }
@ -836,15 +830,16 @@ pub fn get_builtin_op_assignment_fn(
if types_pair == (TypeId::of::<FLOAT>(), TypeId::of::<FLOAT>()) if types_pair == (TypeId::of::<FLOAT>(), TypeId::of::<FLOAT>())
|| types_pair == (TypeId::of::<FLOAT>(), TypeId::of::<INT>()) || types_pair == (TypeId::of::<FLOAT>(), TypeId::of::<INT>())
{ {
#[inline(always)]
fn get_y(args: &FnCallArgs) -> FLOAT { fn get_y(args: &FnCallArgs) -> FLOAT {
let type2 = args[1].type_id(); let type2 = args[1].type_id();
if type2 == TypeId::of::<FLOAT>() { if type2 == TypeId::of::<FLOAT>() {
// FLOAT op= FLOAT // FLOAT op= FLOAT
args[1].clone().cast::<FLOAT>() args[1].as_float().unwrap()
} else if type2 == TypeId::of::<INT>() { } else if type2 == TypeId::of::<INT>() {
// FLOAT op= INT // FLOAT op= INT
args[1].clone().cast::<INT>() as FLOAT args[1].as_int().unwrap() as FLOAT
} else { } else {
unreachable!(); unreachable!();
} }
@ -853,32 +848,27 @@ pub fn get_builtin_op_assignment_fn(
match op { match op {
"+=" => { "+=" => {
return Some(|_, args| { return Some(|_, args| {
let y = get_y(args); Ok((*args[0].write_lock::<FLOAT>().unwrap() += get_y(args)).into())
Ok((*args[0].write_lock::<FLOAT>().unwrap() += y).into())
}) })
} }
"-=" => { "-=" => {
return Some(|_, args| { return Some(|_, args| {
let y = get_y(args); Ok((*args[0].write_lock::<FLOAT>().unwrap() -= get_y(args)).into())
Ok((*args[0].write_lock::<FLOAT>().unwrap() -= y).into())
}) })
} }
"*=" => { "*=" => {
return Some(|_, args| { return Some(|_, args| {
let y = get_y(args); Ok((*args[0].write_lock::<FLOAT>().unwrap() *= get_y(args)).into())
Ok((*args[0].write_lock::<FLOAT>().unwrap() *= y).into())
}) })
} }
"/=" => { "/=" => {
return Some(|_, args| { return Some(|_, args| {
let y = get_y(args); Ok((*args[0].write_lock::<FLOAT>().unwrap() /= get_y(args)).into())
Ok((*args[0].write_lock::<FLOAT>().unwrap() /= y).into())
}) })
} }
"%=" => { "%=" => {
return Some(|_, args| { return Some(|_, args| {
let y = get_y(args); Ok((*args[0].write_lock::<FLOAT>().unwrap() %= get_y(args)).into())
Ok((*args[0].write_lock::<FLOAT>().unwrap() %= y).into())
}) })
} }
"**=" => { "**=" => {
@ -896,91 +886,87 @@ pub fn get_builtin_op_assignment_fn(
if types_pair == (TypeId::of::<Decimal>(), TypeId::of::<Decimal>()) if types_pair == (TypeId::of::<Decimal>(), TypeId::of::<Decimal>())
|| types_pair == (TypeId::of::<Decimal>(), TypeId::of::<INT>()) || types_pair == (TypeId::of::<Decimal>(), TypeId::of::<INT>())
{ {
fn get_y(args: &FnCallArgs) -> Decimal {
let type2 = args[1].type_id();
if type2 == TypeId::of::<Decimal>() {
// Decimal op= Decimal
args[1].clone().cast::<Decimal>()
} else if type2 == TypeId::of::<INT>() {
// Decimal op= INT
Decimal::from(args[1].clone().cast::<INT>())
} else {
unreachable!();
}
}
if cfg!(not(feature = "unchecked")) { if cfg!(not(feature = "unchecked")) {
use crate::packages::arithmetic::decimal_functions::*; use crate::packages::arithmetic::decimal_functions::*;
match op { match op {
"+=" => { "+=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<Decimal>(); let x = args[1].as_decimal().unwrap();
let mut x = args[0].write_lock::<Decimal>().unwrap(); let y = args[1].as_decimal().unwrap();
Ok((*x = add(*x, y)?.as_int().unwrap().into()).into()) Ok((*args[0].write_lock().unwrap() = add(x, y)?).into())
}) })
} }
"-=" => { "-=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<Decimal>(); let x = args[1].as_decimal().unwrap();
let mut x = args[0].write_lock::<Decimal>().unwrap(); let y = args[1].as_decimal().unwrap();
Ok((*x = subtract(*x, y)?.as_int().unwrap().into()).into()) Ok((*args[0].write_lock().unwrap() = subtract(x, y)?).into())
}) })
} }
"*=" => { "*=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<Decimal>(); let x = args[1].as_decimal().unwrap();
let mut x = args[0].write_lock::<Decimal>().unwrap(); let y = args[1].as_decimal().unwrap();
Ok((*x = multiply(*x, y)?.as_int().unwrap().into()).into()) Ok((*args[0].write_lock().unwrap() = multiply(x, y)?).into())
}) })
} }
"/=" => { "/=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<Decimal>(); let x = args[1].as_decimal().unwrap();
let mut x = args[0].write_lock::<Decimal>().unwrap(); let y = args[1].as_decimal().unwrap();
Ok((*x = divide(*x, y)?.as_int().unwrap().into()).into()) Ok((*args[0].write_lock().unwrap() = divide(x, y)?).into())
}) })
} }
"%=" => { "%=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<Decimal>(); let x = args[1].as_decimal().unwrap();
let mut x = args[0].write_lock::<Decimal>().unwrap(); let y = args[1].as_decimal().unwrap();
Ok((*x = modulo(*x, y)?.as_int().unwrap().into()).into()) Ok((*args[0].write_lock().unwrap() = modulo(x, y)?).into())
}) })
} }
_ => (), _ => (),
} }
} else { } else {
#[inline(always)]
fn get_y(args: &FnCallArgs) -> Decimal {
let type2 = args[1].type_id();
if type2 == TypeId::of::<Decimal>() {
// Decimal op= Decimal
args[1].as_decimal().unwrap()
} else if type2 == TypeId::of::<INT>() {
// Decimal op= INT
Decimal::from(args[1].as_int().unwrap())
} else {
unreachable!();
}
}
match op { match op {
"+=" => { "+=" => {
return Some(|_, args| { return Some(|_, args| {
let y = get_y(args); Ok((*args[0].write_lock::<Decimal>().unwrap() += get_y(args)).into())
Ok((*args[0].write_lock::<Decimal>().unwrap() += y).into())
}) })
} }
"-=" => { "-=" => {
return Some(|_, args| { return Some(|_, args| {
let y = get_y(args); Ok((*args[0].write_lock::<Decimal>().unwrap() -= get_y(args)).into())
Ok((*args[0].write_lock::<Decimal>().unwrap() -= y).into())
}) })
} }
"*=" => { "*=" => {
return Some(|_, args| { return Some(|_, args| {
let y = get_y(args); Ok((*args[0].write_lock::<Decimal>().unwrap() *= get_y(args)).into())
Ok((*args[0].write_lock::<Decimal>().unwrap() *= y).into())
}) })
} }
"/=" => { "/=" => {
return Some(|_, args| { return Some(|_, args| {
let y = get_y(args); Ok((*args[0].write_lock::<Decimal>().unwrap() /= get_y(args)).into())
Ok((*args[0].write_lock::<Decimal>().unwrap() /= y).into())
}) })
} }
"%=" => { "%=" => {
return Some(|_, args| { return Some(|_, args| {
let y = get_y(args); Ok((*args[0].write_lock::<Decimal>().unwrap() %= get_y(args)).into())
Ok((*args[0].write_lock::<Decimal>().unwrap() %= y).into())
}) })
} }
_ => return None, _ => return None,
@ -993,13 +979,13 @@ pub fn get_builtin_op_assignment_fn(
match op { match op {
"+=" => { "+=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<char>(); let y = args[1].as_char().unwrap();
Ok((*args[0].write_lock::<ImmutableString>().unwrap() += y).into()) Ok((*args[0].write_lock::<ImmutableString>().unwrap() += y).into())
}) })
} }
"-=" => { "-=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<char>(); let y = args[1].as_char().unwrap();
Ok((*args[0].write_lock::<ImmutableString>().unwrap() -= y).into()) Ok((*args[0].write_lock::<ImmutableString>().unwrap() -= y).into())
}) })
} }
@ -1011,8 +997,8 @@ pub fn get_builtin_op_assignment_fn(
match op { match op {
"+=" => { "+=" => {
return Some(|_, args| { return Some(|_, args| {
let mut ch = args[0].read_lock::<char>().unwrap().to_string(); let mut ch = args[0].as_char().unwrap().to_string();
ch.push_str(args[1].read_lock::<ImmutableString>().unwrap().as_str()); ch.push_str(args[1].as_locked_immutable_string().unwrap().as_str());
let mut x = args[0].write_lock::<Dynamic>().unwrap(); let mut x = args[0].write_lock::<Dynamic>().unwrap();
Ok((*x = ch.into()).into()) Ok((*x = ch.into()).into())
@ -1035,58 +1021,58 @@ pub fn get_builtin_op_assignment_fn(
match op { match op {
"+=" => { "+=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let x = args[0].as_int().unwrap();
let mut x = args[0].write_lock::<INT>().unwrap(); let y = args[1].as_int().unwrap();
Ok((*x = add(*x, y)?.as_int().unwrap().into()).into()) Ok((*args[0].write_lock().unwrap() = add(x, y)?).into())
}) })
} }
"-=" => { "-=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let x = args[0].as_int().unwrap();
let mut x = args[0].write_lock::<INT>().unwrap(); let y = args[1].as_int().unwrap();
Ok((*x = subtract(*x, y)?.as_int().unwrap().into()).into()) Ok((*args[0].write_lock().unwrap() = subtract(x, y)?).into())
}) })
} }
"*=" => { "*=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let x = args[0].as_int().unwrap();
let mut x = args[0].write_lock::<INT>().unwrap(); let y = args[1].as_int().unwrap();
Ok((*x = multiply(*x, y)?.as_int().unwrap().into()).into()) Ok((*args[0].write_lock().unwrap() = multiply(x, y)?).into())
}) })
} }
"/=" => { "/=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let x = args[0].as_int().unwrap();
let mut x = args[0].write_lock::<INT>().unwrap(); let y = args[1].as_int().unwrap();
Ok((*x = divide(*x, y)?.as_int().unwrap().into()).into()) Ok((*args[0].write_lock().unwrap() = divide(x, y)?).into())
}) })
} }
"%=" => { "%=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let x = args[0].as_int().unwrap();
let mut x = args[0].write_lock::<INT>().unwrap(); let y = args[1].as_int().unwrap();
Ok((*x = modulo(*x, y)?.as_int().unwrap().into()).into()) Ok((*args[0].write_lock().unwrap() = modulo(x, y)?).into())
}) })
} }
"**=" => { "**=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let x = args[0].as_int().unwrap();
let mut x = args[0].write_lock::<INT>().unwrap(); let y = args[1].as_int().unwrap();
Ok((*x = power(*x, y)?.as_int().unwrap().into()).into()) Ok((*args[0].write_lock().unwrap() = power(x, y)?).into())
}) })
} }
">>=" => { ">>=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let x = args[0].as_int().unwrap();
let mut x = args[0].write_lock::<INT>().unwrap(); let y = args[1].as_int().unwrap();
Ok((*x = shift_right(*x, y)?.as_int().unwrap().into()).into()) Ok((*args[0].write_lock().unwrap() = shift_right(x, y)?).into())
}) })
} }
"<<=" => { "<<=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let x = args[0].as_int().unwrap();
let mut x = args[0].write_lock::<INT>().unwrap(); let y = args[1].as_int().unwrap();
Ok((*x = shift_left(*x, y)?.as_int().unwrap().into()).into()) Ok((*args[0].write_lock().unwrap() = shift_left(x, y)?).into())
}) })
} }
_ => (), _ => (),
@ -1095,50 +1081,50 @@ pub fn get_builtin_op_assignment_fn(
match op { match op {
"+=" => { "+=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let y = args[1].as_int().unwrap();
Ok((*args[0].write_lock::<INT>().unwrap() += y).into()) Ok((*args[0].write_lock::<INT>().unwrap() += y).into())
}) })
} }
"-=" => { "-=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let y = args[1].as_int().unwrap();
Ok((*args[0].write_lock::<INT>().unwrap() -= y).into()) Ok((*args[0].write_lock::<INT>().unwrap() -= y).into())
}) })
} }
"*=" => { "*=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let y = args[1].as_int().unwrap();
Ok((*args[0].write_lock::<INT>().unwrap() *= y).into()) Ok((*args[0].write_lock::<INT>().unwrap() *= y).into())
}) })
} }
"/=" => { "/=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let y = args[1].as_int().unwrap();
Ok((*args[0].write_lock::<INT>().unwrap() /= y).into()) Ok((*args[0].write_lock::<INT>().unwrap() /= y).into())
}) })
} }
"%=" => { "%=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let y = args[1].as_int().unwrap();
Ok((*args[0].write_lock::<INT>().unwrap() %= y).into()) Ok((*args[0].write_lock::<INT>().unwrap() %= y).into())
}) })
} }
"**=" => { "**=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let y = args[1].as_int().unwrap();
let mut x = args[0].write_lock::<INT>().unwrap(); let mut x = args[0].write_lock::<INT>().unwrap();
Ok((*x = x.pow(y as u32)).into()) Ok((*x = x.pow(y as u32)).into())
}) })
} }
">>=" => { ">>=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let y = args[1].as_int().unwrap();
Ok((*args[0].write_lock::<INT>().unwrap() >>= y).into()) Ok((*args[0].write_lock::<INT>().unwrap() >>= y).into())
}) })
} }
"<<=" => { "<<=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let y = args[1].as_int().unwrap();
Ok((*args[0].write_lock::<INT>().unwrap() <<= y).into()) Ok((*args[0].write_lock::<INT>().unwrap() <<= y).into())
}) })
} }
@ -1149,19 +1135,19 @@ pub fn get_builtin_op_assignment_fn(
match op { match op {
"&=" => { "&=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let y = args[1].as_int().unwrap();
Ok((*args[0].write_lock::<INT>().unwrap() &= y).into()) Ok((*args[0].write_lock::<INT>().unwrap() &= y).into())
}) })
} }
"|=" => { "|=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let y = args[1].as_int().unwrap();
Ok((*args[0].write_lock::<INT>().unwrap() |= y).into()) Ok((*args[0].write_lock::<INT>().unwrap() |= y).into())
}) })
} }
"^=" => { "^=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<INT>(); let y = args[1].as_int().unwrap();
Ok((*args[0].write_lock::<INT>().unwrap() ^= y).into()) Ok((*args[0].write_lock::<INT>().unwrap() ^= y).into())
}) })
} }
@ -1193,7 +1179,7 @@ pub fn get_builtin_op_assignment_fn(
match op { match op {
"+=" => { "+=" => {
return Some(|_, args| { return Some(|_, args| {
let y = args[1].clone().cast::<char>(); let y = args[1].as_char().unwrap();
let mut x = args[0].write_lock::<Dynamic>().unwrap(); let mut x = args[0].write_lock::<Dynamic>().unwrap();
Ok((*x = format!("{}{}", *x, y).into()).into()) Ok((*x = format!("{}{}", *x, y).into()).into())
}) })
@ -1208,7 +1194,7 @@ pub fn get_builtin_op_assignment_fn(
return Some(|_, args| { return Some(|_, args| {
let (first, second) = args.split_first_mut().unwrap(); let (first, second) = args.split_first_mut().unwrap();
let mut x = first.write_lock::<ImmutableString>().unwrap(); let mut x = first.write_lock::<ImmutableString>().unwrap();
let y = &*second[0].read_lock::<ImmutableString>().unwrap(); let y = &*second[0].as_locked_immutable_string().unwrap();
Ok((*x += y).into()) Ok((*x += y).into())
}) })
} }
@ -1216,7 +1202,7 @@ pub fn get_builtin_op_assignment_fn(
return Some(|_, args| { return Some(|_, args| {
let (first, second) = args.split_first_mut().unwrap(); let (first, second) = args.split_first_mut().unwrap();
let mut x = first.write_lock::<ImmutableString>().unwrap(); let mut x = first.write_lock::<ImmutableString>().unwrap();
let y = &*second[0].read_lock::<ImmutableString>().unwrap(); let y = &*second[0].as_locked_immutable_string().unwrap();
Ok((*x -= y).into()) Ok((*x -= y).into())
}) })
} }