Merge pull request #41 from schungx/plugins_dev

New PR

Cargo.toml

@@ -17,7 +17,6 @@ keywords = [ "scripting" ]
 categories = [ "no-std", "embedded", "wasm", "parser-implementations" ]
 
 [dependencies]
-num-traits = { version = "0.2.11", default-features = false }
 smallvec = { version = "1.4.1", default-features = false }
 rhai_codegen = { version = "0.1", path = "codegen" }
 
@@ -52,6 +51,11 @@ version = "0.2.1"
 default_features = false
 optional = true
 
+[dependencies.num-traits]
+version = "0.2.11"
+default-features = false
+optional = true
+
 [dependencies.core-error]
 version = "0.0.0"
 default_features = false

RELEASES.md

@@ -12,6 +12,15 @@ Bug fixes
 * Closures that capture now work under `no_object`.
 
 
+Version 0.18.2
+==============
+
+New features
+------------
+
+* Adds `Module::combine_flatten` to combine two modules while flattening to the root level.
+
+
 Version 0.18.2
 ==============
 

doc/src/about/features.md

@@ -14,7 +14,7 @@ Easy
 
 * Easily [call a script-defined function]({{rootUrl}}/engine/call-fn.md) from Rust.
 
-* Very few additional dependencies (right now only [`num-traits`](https://crates.io/crates/num-traits/) to do checked arithmetic operations, and [`smallvec`](https://crates.io/crates/smallvec/));
+* Very few additional dependencies (right now only [`smallvec`](https://crates.io/crates/smallvec/));
   for [`no-std`] builds, a number of additional dependencies are pulled in to provide for functionalities that used to be in `std`.
 
 Fast

src/fn_call.rs

@@ -52,6 +52,10 @@ use crate::stdlib::{
 #[cfg(not(feature = "no_function"))]
 use crate::stdlib::{collections::HashSet, string::String};
 
+#[cfg(feature = "no_std")]
+#[cfg(not(feature = "no_float"))]
+use num_traits::float::Float;
+
 /// Extract the property name from a getter function name.
 #[inline(always)]
 fn extract_prop_from_getter(_fn_name: &str) -> Option<&str> {
@@ -1120,7 +1124,7 @@ pub fn run_builtin_binary_op(
     x: &Dynamic,
     y: &Dynamic,
 ) -> Result<Option<Dynamic>, Box<EvalAltResult>> {
-    use crate::packages::arithmetic::*;
+    use crate::packages::arithmetic::arith_basic::INT::functions::*;
 
     let args_type = x.type_id();
 
@@ -1134,14 +1138,14 @@ pub fn run_builtin_binary_op(
 
         if cfg!(not(feature = "unchecked")) {
             match op {
-                "+" => return add(x, y).map(Into::into).map(Some),
+                "+" => return add(x, y).map(Some),
-                "-" => return sub(x, y).map(Into::into).map(Some),
+                "-" => return subtract(x, y).map(Some),
-                "*" => return mul(x, y).map(Into::into).map(Some),
+                "*" => return multiply(x, y).map(Some),
-                "/" => return div(x, y).map(Into::into).map(Some),
+                "/" => return divide(x, y).map(Some),
-                "%" => return modulo(x, y).map(Into::into).map(Some),
+                "%" => return modulo(x, y).map(Some),
-                "~" => return pow_i_i(x, y).map(Into::into).map(Some),
+                "~" => return power(x, y).map(Some),
-                ">>" => return shr(x, y).map(Into::into).map(Some),
+                ">>" => return shift_right(x, y).map(Some),
-                "<<" => return shl(x, y).map(Into::into).map(Some),
+                "<<" => return shift_left(x, y).map(Some),
                 _ => (),
             }
         } else {
@@ -1151,9 +1155,9 @@ pub fn run_builtin_binary_op(
                 "*" => return Ok(Some((x * y).into())),
                 "/" => return Ok(Some((x / y).into())),
                 "%" => return Ok(Some((x % y).into())),
-                "~" => return pow_i_i_u(x, y).map(Into::into).map(Some),
+                "~" => return Ok(Some(x.pow(y as u32).into())),
-                ">>" => return shr_u(x, y).map(Into::into).map(Some),
+                ">>" => return Ok(Some((x >> y).into())),
-                "<<" => return shl_u(x, y).map(Into::into).map(Some),
+                "<<" => return Ok(Some((x << y).into())),
                 _ => (),
             }
         }
@@ -1228,7 +1232,7 @@ pub fn run_builtin_binary_op(
             "*" => return Ok(Some((x * y).into())),
             "/" => return Ok(Some((x / y).into())),
             "%" => return Ok(Some((x % y).into())),
-            "~" => return pow_f_f(x, y).map(Into::into).map(Some),
+            "~" => return Ok(Some(x.powf(y).into())),
             "==" => return Ok(Some((x == y).into())),
             "!=" => return Ok(Some((x != y).into())),
             ">" => return Ok(Some((x > y).into())),
@@ -1248,7 +1252,7 @@ pub fn run_builtin_op_assignment(
     x: &mut Dynamic,
     y: &Dynamic,
 ) -> Result<Option<()>, Box<EvalAltResult>> {
-    use crate::packages::arithmetic::*;
+    use crate::packages::arithmetic::arith_basic::INT::functions::*;
 
     let args_type = x.type_id();
 
@@ -1262,14 +1266,14 @@ pub fn run_builtin_op_assignment(
 
         if cfg!(not(feature = "unchecked")) {
             match op {
-                "+=" => return Ok(Some(*x = add(*x, y)?)),
+                "+=" => return Ok(Some(*x = add(*x, y)?.as_int().unwrap())),
-                "-=" => return Ok(Some(*x = sub(*x, y)?)),
+                "-=" => return Ok(Some(*x = subtract(*x, y)?.as_int().unwrap())),
-                "*=" => return Ok(Some(*x = mul(*x, y)?)),
+                "*=" => return Ok(Some(*x = multiply(*x, y)?.as_int().unwrap())),
-                "/=" => return Ok(Some(*x = div(*x, y)?)),
+                "/=" => return Ok(Some(*x = divide(*x, y)?.as_int().unwrap())),
-                "%=" => return Ok(Some(*x = modulo(*x, y)?)),
+                "%=" => return Ok(Some(*x = modulo(*x, y)?.as_int().unwrap())),
-                "~=" => return Ok(Some(*x = pow_i_i(*x, y)?)),
+                "~=" => return Ok(Some(*x = power(*x, y)?.as_int().unwrap())),
-                ">>=" => return Ok(Some(*x = shr(*x, y)?)),
+                ">>=" => return Ok(Some(*x = shift_right(*x, y)?.as_int().unwrap())),
-                "<<=" => return Ok(Some(*x = shl(*x, y)?)),
+                "<<=" => return Ok(Some(*x = shift_left(*x, y)?.as_int().unwrap())),
                 _ => (),
             }
         } else {
@@ -1279,9 +1283,9 @@ pub fn run_builtin_op_assignment(
                 "*=" => return Ok(Some(*x *= y)),
                 "/=" => return Ok(Some(*x /= y)),
                 "%=" => return Ok(Some(*x %= y)),
-                "~=" => return Ok(Some(*x = pow_i_i_u(*x, y)?)),
+                "~=" => return Ok(Some(*x = x.pow(y as u32))),
-                ">>=" => return Ok(Some(*x = shr_u(*x, y)?)),
+                ">>=" => return Ok(Some(*x = *x >> y)),
-                "<<=" => return Ok(Some(*x = shl_u(*x, y)?)),
+                "<<=" => return Ok(Some(*x = *x << y)),
                 _ => (),
             }
         }
@@ -1322,7 +1326,7 @@ pub fn run_builtin_op_assignment(
             "*=" => return Ok(Some(*x *= y)),
             "/=" => return Ok(Some(*x /= y)),
             "%=" => return Ok(Some(*x %= y)),
-            "~=" => return Ok(Some(*x = pow_f_f(*x, y)?)),
+            "~=" => return Ok(Some(*x = x.powf(y))),
             _ => (),
         }
     }

src/module.rs

@@ -931,6 +931,24 @@ impl Module {
     /// Combine another module into this module.
     /// The other module is consumed to merge into this module.
     pub fn combine(&mut self, other: Self) -> &mut Self {
+        self.modules.extend(other.modules.into_iter());
+        self.variables.extend(other.variables.into_iter());
+        self.functions.extend(other.functions.into_iter());
+        self.type_iterators.extend(other.type_iterators.into_iter());
+        self.all_functions.clear();
+        self.all_variables.clear();
+        self.indexed = false;
+        self
+    }
+
+    /// Combine another module into this module.
+    /// The other module is consumed to merge into this module.
+    /// Sub-modules are flattened onto the root module, with higher level overriding lower level.
+    pub fn combine_flatten(&mut self, other: Self) -> &mut Self {
+        other.modules.into_iter().for_each(|(_, m)| {
+            self.combine_flatten(m);
+        });
+
         self.variables.extend(other.variables.into_iter());
         self.functions.extend(other.functions.into_iter());
         self.type_iterators.extend(other.type_iterators.into_iter());
@@ -942,15 +960,26 @@ impl Module {
 
     /// Merge another module into this module.
     pub fn merge(&mut self, other: &Self) -> &mut Self {
-        self.merge_filtered(other, |_, _, _| true)
+        self.merge_filtered(other, &|_, _, _| true)
     }
 
     /// Merge another module into this module, with only selected script-defined functions based on a filter predicate.
     pub(crate) fn merge_filtered(
         &mut self,
         other: &Self,
-        _filter: impl Fn(FnAccess, &str, usize) -> bool,
+        _filter: &impl Fn(FnAccess, &str, usize) -> bool,
     ) -> &mut Self {
+        #[cfg(not(feature = "no_function"))]
+        for (k, v) in &other.modules {
+            let mut m = Self::new();
+            m.merge_filtered(v, _filter);
+            self.modules.insert(k.clone(), m);
+        }
+
+        #[cfg(feature = "no_function")]
+        self.modules
+            .extend(other.modules.iter().map(|(k, v)| (k.clone(), v.clone())));
+
         self.variables
             .extend(other.variables.iter().map(|(k, v)| (k.clone(), v.clone())));
 

src/packages/arithmetic.rs

@@ -1,205 +1,117 @@
+#![allow(non_snake_case)]
+
 use crate::def_package;
-use crate::module::FuncReturn;
 use crate::parser::INT;
+use crate::plugin::*;
 
 use crate::{result::EvalAltResult, token::Position};
 
 #[cfg(not(feature = "no_float"))]
 use crate::parser::FLOAT;
 
-use num_traits::{
-    identities::Zero, CheckedAdd, CheckedDiv, CheckedMul, CheckedNeg, CheckedRem, CheckedShl,
-    CheckedShr, CheckedSub,
-};
-
 #[cfg(feature = "no_std")]
 #[cfg(not(feature = "no_float"))]
 use num_traits::float::Float;
 
-use crate::stdlib::{
+use crate::stdlib::format;
-    fmt::Display,
-    format,
-    ops::{Add, BitAnd, BitOr, BitXor, Div, Mul, Neg, Rem, Shl, Shr, Sub},
-};
 
-// Checked add
+macro_rules! gen_arithmetic_functions {
-pub fn add<T: Display + CheckedAdd>(x: T, y: T) -> FuncReturn<T> {
+    ($root:ident => $($arg_type:ident),+) => {
-    x.checked_add(&y).ok_or_else(|| {
+        pub mod $root { $(
+            pub mod $arg_type {
+                use super::super::*;
+
+                #[export_module]
+                pub mod functions {
+                    #[rhai_fn(name = "+", return_raw)]
+                    #[inline]
+                    pub fn add(x: $arg_type, y: $arg_type) -> Result<Dynamic, Box<EvalAltResult>> {
+                        if cfg!(not(feature = "unchecked")) {
+                            x.checked_add(y).ok_or_else(|| {
                                 EvalAltResult::ErrorArithmetic(
                                     format!("Addition overflow: {} + {}", x, y),
                                     Position::none(),
                                 )
                                 .into()
-    })
+                            }).map(Dynamic::from)
-}
+                        } else {
-// Checked subtract
+                            Ok(Dynamic::from(x + y))
-pub fn sub<T: Display + CheckedSub>(x: T, y: T) -> FuncReturn<T> {
+                        }
-    x.checked_sub(&y).ok_or_else(|| {
+                    }
+                    #[rhai_fn(name = "-", return_raw)]
+                    #[inline]
+                    pub fn subtract(x: $arg_type, y: $arg_type) -> Result<Dynamic, Box<EvalAltResult>> {
+                        if cfg!(not(feature = "unchecked")) {
+                            x.checked_sub(y).ok_or_else(|| {
                                 EvalAltResult::ErrorArithmetic(
-            format!("Subtraction underflow: {} - {}", x, y),
+                                    format!("Subtraction overflow: {} - {}", x, y),
                                     Position::none(),
                                 )
                                 .into()
-    })
+                            }).map(Dynamic::from)
-}
+                        } else {
-// Checked multiply
+                            Ok(Dynamic::from(x - y))
-pub fn mul<T: Display + CheckedMul>(x: T, y: T) -> FuncReturn<T> {
+                        }
-    x.checked_mul(&y).ok_or_else(|| {
+                    }
+                    #[rhai_fn(name = "*", return_raw)]
+                    #[inline]
+                    pub fn multiply(x: $arg_type, y: $arg_type) -> Result<Dynamic, Box<EvalAltResult>> {
+                        if cfg!(not(feature = "unchecked")) {
+                            x.checked_mul(y).ok_or_else(|| {
                                 EvalAltResult::ErrorArithmetic(
                                     format!("Multiplication overflow: {} * {}", x, y),
                                     Position::none(),
                                 )
                                 .into()
-    })
+                            }).map(Dynamic::from)
-}
+                        } else {
-// Checked divide
+                            Ok(Dynamic::from(x * y))
-pub fn div<T>(x: T, y: T) -> FuncReturn<T>
+                        }
-where
+                    }
-    T: Display + CheckedDiv + PartialEq + Zero,
+                    #[rhai_fn(name = "/", return_raw)]
-{
+                    #[inline]
+                    pub fn divide(x: $arg_type, y: $arg_type) -> Result<Dynamic, Box<EvalAltResult>> {
+                        if cfg!(not(feature = "unchecked")) {
                             // Detect division by zero
-    if y == T::zero() {
+                            if y == 0 {
-        return EvalAltResult::ErrorArithmetic(
+                                EvalAltResult::ErrorArithmetic(
                                     format!("Division by zero: {} / {}", x, y),
                                     Position::none(),
                                 )
-        .into();
+                                .into()
-    }
+                            } else {
-
+                                x.checked_div(y).ok_or_else(|| {
-    x.checked_div(&y).ok_or_else(|| {
                                     EvalAltResult::ErrorArithmetic(
                                         format!("Division overflow: {} / {}", x, y),
                                         Position::none(),
                                     )
                                     .into()
-    })
+                                }).map(Dynamic::from)
-}
+                            }
-// Checked negative - e.g. -(i32::MIN) will overflow i32::MAX
-pub fn neg<T: Display + CheckedNeg>(x: T) -> FuncReturn<T> {
-    x.checked_neg().ok_or_else(|| {
-        EvalAltResult::ErrorArithmetic(format!("Negation overflow: -{}", x), Position::none())
-            .into()
-    })
-}
-// Checked absolute
-pub fn abs<T: Display + CheckedNeg + PartialOrd + Zero>(x: T) -> FuncReturn<T> {
-    // FIX - We don't use Signed::abs() here because, contrary to documentation, it panics
-    //       when the number is ::MIN instead of returning ::MIN itself.
-    if x >= <T as Zero>::zero() {
-        Ok(x)
                         } else {
-        x.checked_neg().ok_or_else(|| {
+                            Ok(Dynamic::from(x / y))
-            EvalAltResult::ErrorArithmetic(format!("Negation overflow: -{}", x), Position::none())
-                .into()
-        })
                         }
-}
-// Unchecked add - may panic on overflow
-fn add_u<T: Add>(x: T, y: T) -> FuncReturn<<T as Add>::Output> {
-    Ok(x + y)
-}
-// Unchecked subtract - may panic on underflow
-fn sub_u<T: Sub>(x: T, y: T) -> FuncReturn<<T as Sub>::Output> {
-    Ok(x - y)
-}
-// Unchecked multiply - may panic on overflow
-fn mul_u<T: Mul>(x: T, y: T) -> FuncReturn<<T as Mul>::Output> {
-    Ok(x * y)
-}
-// Unchecked divide - may panic when dividing by zero
-fn div_u<T: Div>(x: T, y: T) -> FuncReturn<<T as Div>::Output> {
-    Ok(x / y)
-}
-// Unchecked negative - may panic on overflow
-fn neg_u<T: Neg>(x: T) -> FuncReturn<<T as Neg>::Output> {
-    Ok(-x)
-}
-// Unchecked absolute - may panic on overflow
-fn abs_u<T>(x: T) -> FuncReturn<<T as Neg>::Output>
-where
-    T: Neg + PartialOrd + Default + Into<<T as Neg>::Output>,
-{
-    // Numbers should default to zero
-    if x < Default::default() {
-        Ok(-x)
-    } else {
-        Ok(x.into())
                     }
-}
+                    #[rhai_fn(name = "%", return_raw)]
-// Bit operators
+                    #[inline]
-fn binary_and<T: BitAnd>(x: T, y: T) -> FuncReturn<<T as BitAnd>::Output> {
+                    pub fn modulo(x: $arg_type, y: $arg_type) -> Result<Dynamic, Box<EvalAltResult>> {
-    Ok(x & y)
+                        if cfg!(not(feature = "unchecked")) {
-}
+                            x.checked_rem(y).ok_or_else(|| {
-fn binary_or<T: BitOr>(x: T, y: T) -> FuncReturn<<T as BitOr>::Output> {
-    Ok(x | y)
-}
-fn binary_xor<T: BitXor>(x: T, y: T) -> FuncReturn<<T as BitXor>::Output> {
-    Ok(x ^ y)
-}
-// Checked left-shift
-pub fn shl<T: Display + CheckedShl>(x: T, y: INT) -> FuncReturn<T> {
-    // Cannot shift by a negative number of bits
-    if y < 0 {
-        return EvalAltResult::ErrorArithmetic(
-            format!("Left-shift by a negative number: {} << {}", x, y),
-            Position::none(),
-        )
-        .into();
-    }
-
-    CheckedShl::checked_shl(&x, y as u32).ok_or_else(|| {
-        EvalAltResult::ErrorArithmetic(
-            format!("Left-shift by too many bits: {} << {}", x, y),
-            Position::none(),
-        )
-        .into()
-    })
-}
-// Checked right-shift
-pub fn shr<T: Display + CheckedShr>(x: T, y: INT) -> FuncReturn<T> {
-    // Cannot shift by a negative number of bits
-    if y < 0 {
-        return EvalAltResult::ErrorArithmetic(
-            format!("Right-shift by a negative number: {} >> {}", x, y),
-            Position::none(),
-        )
-        .into();
-    }
-
-    CheckedShr::checked_shr(&x, y as u32).ok_or_else(|| {
-        EvalAltResult::ErrorArithmetic(
-            format!("Right-shift by too many bits: {} % {}", x, y),
-            Position::none(),
-        )
-        .into()
-    })
-}
-// Unchecked left-shift - may panic if shifting by a negative number of bits
-pub fn shl_u<T: Shl<T>>(x: T, y: T) -> FuncReturn<<T as Shl<T>>::Output> {
-    Ok(x.shl(y))
-}
-// Unchecked right-shift - may panic if shifting by a negative number of bits
-pub fn shr_u<T: Shr<T>>(x: T, y: T) -> FuncReturn<<T as Shr<T>>::Output> {
-    Ok(x.shr(y))
-}
-// Checked modulo
-pub fn modulo<T: Display + CheckedRem>(x: T, y: T) -> FuncReturn<T> {
-    x.checked_rem(&y).ok_or_else(|| {
                                 EvalAltResult::ErrorArithmetic(
                                     format!("Modulo division by zero or overflow: {} % {}", x, y),
                                     Position::none(),
                                 )
                                 .into()
-    })
+                            }).map(Dynamic::from)
-}
+                        } else {
-// Unchecked modulo - may panic if dividing by zero
+                            Ok(Dynamic::from(x % y))
-fn modulo_u<T: Rem>(x: T, y: T) -> FuncReturn<<T as Rem>::Output> {
+                        }
-    Ok(x % y)
+                    }
-}
+                    #[rhai_fn(name = "~", return_raw)]
-// Checked power
+                    #[inline]
-pub fn pow_i_i(x: INT, y: INT) -> FuncReturn<INT> {
+                    pub fn power(x: INT, y: INT) -> Result<Dynamic, Box<EvalAltResult>> {
-    if cfg!(not(feature = "only_i32")) {
+                        if cfg!(not(feature = "unchecked")) {
-        if y > (u32::MAX as INT) {
+                            if cfg!(not(feature = "only_i32")) && y > (u32::MAX as INT) {
                                 EvalAltResult::ErrorArithmetic(
                                     format!("Integer raised to too large an index: {} ~ {}", x, y),
                                     Position::none(),
@@ -218,202 +130,275 @@ pub fn pow_i_i(x: INT, y: INT) -> FuncReturn<INT> {
                                         Position::none(),
                                     )
                                     .into()
-            })
+                                }).map(Dynamic::from)
                             }
                         } else {
-        if y < 0 {
+                            Ok(Dynamic::from(x.pow(y as u32)))
+                        }
+                    }
+
+                    #[rhai_fn(name = "<<", return_raw)]
+                    #[inline]
+                    pub fn shift_left(x: $arg_type, y: INT) -> Result<Dynamic, Box<EvalAltResult>> {
+                        if cfg!(not(feature = "unchecked")) {
+                            if cfg!(not(feature = "only_i32")) && y > (u32::MAX as INT) {
                                 EvalAltResult::ErrorArithmetic(
-                format!("Integer raised to a negative index: {} ~ {}", x, y),
+                                    format!("Left-shift by too many bits: {} << {}", x, y),
+                                    Position::none(),
+                                )
+                                .into()
+                            } else if y < 0 {
+                                EvalAltResult::ErrorArithmetic(
+                                    format!("Left-shift by a negative number: {} << {}", x, y),
                                     Position::none(),
                                 )
                                 .into()
                             } else {
-            x.checked_pow(y as u32).ok_or_else(|| {
+                                x.checked_shl(y as u32).ok_or_else(|| {
                                     EvalAltResult::ErrorArithmetic(
-                    format!("Power overflow: {} ~ {}", x, y),
+                                        format!("Left-shift by too many bits: {} << {}", x, y),
                                         Position::none(),
                                     )
                                     .into()
-            })
+                                }).map(Dynamic::from)
+                            }
+                        } else {
+                            Ok(Dynamic::from(x << y))
                         }
                     }
-}
+                    #[rhai_fn(name = ">>", return_raw)]
-// Unchecked integer power - may panic on overflow or if the power index is too high (> u32::MAX)
+                    #[inline]
-pub fn pow_i_i_u(x: INT, y: INT) -> FuncReturn<INT> {
+                    pub fn shift_right(x: $arg_type, y: INT) -> Result<Dynamic, Box<EvalAltResult>> {
-    Ok(x.pow(y as u32))
+                        if cfg!(not(feature = "unchecked")) {
-}
+                            if cfg!(not(feature = "only_i32")) && y > (u32::MAX as INT) {
-// Floating-point power - always well-defined
+                                EvalAltResult::ErrorArithmetic(
-#[cfg(not(feature = "no_float"))]
+                                    format!("Right-shift by too many bits: {} >> {}", x, y),
-pub fn pow_f_f(x: FLOAT, y: FLOAT) -> FuncReturn<FLOAT> {
-    Ok(x.powf(y))
-}
-// Checked power
-#[cfg(not(feature = "no_float"))]
-pub fn pow_f_i(x: FLOAT, y: INT) -> FuncReturn<FLOAT> {
-    // Raise to power that is larger than an i32
-    if y > (i32::MAX as INT) {
-        return EvalAltResult::ErrorArithmetic(
-            format!("Number raised to too large an index: {} ~ {}", x, y),
                                     Position::none(),
                                 )
-        .into();
+                                .into()
-    }
+                            } else if y < 0 {
-
+                                EvalAltResult::ErrorArithmetic(
-    Ok(x.powi(y as i32))
+                                    format!("Right-shift by a negative number: {} >> {}", x, y),
-}
+                                    Position::none(),
-// Unchecked power - may be incorrect if the power index is too high (> i32::MAX)
+                                )
-#[cfg(not(feature = "no_float"))]
+                                .into()
-pub fn pow_f_i_u(x: FLOAT, y: INT) -> FuncReturn<FLOAT> {
-    Ok(x.powi(y as i32))
-}
-
-macro_rules! reg_unary {
-    ($lib:expr, $op:expr, $func:ident, $($par:ty),*) => {
-        $( $lib.set_fn_1($op, $func::<$par>); )*
-    };
-}
-macro_rules! reg_op {
-    ($lib:expr, $op:expr, $func:ident, $($par:ty),*) => {
-        $( $lib.set_fn_2($op, $func::<$par>); )*
-    };
-}
-macro_rules! reg_sign {
-    ($lib:expr, $op:expr, $ret:ty, $($par:ty),*) => {
-        $( $lib.set_fn_1($op, |value: $par| -> Result<$ret, _> {
-            Ok(if value == (0 as $par) {
-                (0 as $ret)
-            } else if value < (0 as $par) {
-                (-1 as $ret)
                             } else {
-                (1 as $ret)
+                                x.checked_shr(y as u32).ok_or_else(|| {
-            })
+                                    EvalAltResult::ErrorArithmetic(
-        }); )*
+                                        format!("Right-shift by too many bits: {} >> {}", x, y),
-    };
+                                        Position::none(),
+                                    )
+                                    .into()
+                                }).map(Dynamic::from)
+                            }
+                        } else {
+                            Ok(Dynamic::from(x >> y))
+                        }
+                    }
+                    #[rhai_fn(name = "&")]
+                    #[inline(always)]
+                    fn binary_and(x: $arg_type, y: $arg_type) -> $arg_type {
+                        x & y
+                    }
+                    #[rhai_fn(name = "|")]
+                    #[inline(always)]
+                    fn binary_or(x: $arg_type, y: $arg_type) -> $arg_type {
+                        x | y
+                    }
+                    #[rhai_fn(name = "^")]
+                    #[inline(always)]
+                    fn binary_xor(x: $arg_type, y: $arg_type) -> $arg_type {
+                        x ^ y
+                    }
+                }
+            }
+        )* }
+    }
+}
+
+macro_rules! gen_signed_functions {
+    ($root:ident => $($arg_type:ident),+) => {
+        pub mod $root { $(
+            pub mod $arg_type {
+                use super::super::*;
+
+                #[export_module]
+                pub mod functions {
+                    #[rhai_fn(name = "-", return_raw)]
+                    #[inline]
+                    pub fn neg(x: $arg_type) -> Result<Dynamic, Box<EvalAltResult>> {
+                        if cfg!(not(feature = "unchecked")) {
+                            x.checked_neg().ok_or_else(|| {
+                                EvalAltResult::ErrorArithmetic(format!("Negation overflow: -{}", x), Position::none())
+                                    .into()
+                            }).map(Dynamic::from)
+                        } else {
+                            Ok(Dynamic::from(-x))
+                        }
+                    }
+                    #[rhai_fn(return_raw)]
+                    #[inline]
+                    pub fn abs(x: $arg_type) -> Result<Dynamic, Box<EvalAltResult>> {
+                        if cfg!(not(feature = "unchecked")) {
+                            x.checked_abs().ok_or_else(|| {
+                                EvalAltResult::ErrorArithmetic(format!("Negation overflow: -{}", x), Position::none())
+                                    .into()
+                            }).map(Dynamic::from)
+                        } else {
+                            Ok(Dynamic::from(x.abs()))
+                        }
+                    }
+                    #[inline]
+                    pub fn sign(x: $arg_type) -> INT {
+                        if x == 0 {
+                            0
+                        } else if x < 0 {
+                            -1
+                        } else {
+                            1
+                        }
+                    }
+                }
+            }
+        )* }
+    }
+}
+
+macro_rules! reg_functions {
+    ($mod_name:ident += $root:ident ; $($arg_type:ident),+ ) => {
+        $($mod_name.combine_flatten(exported_module!($root::$arg_type::functions));)*
+    }
 }
 
 def_package!(crate:ArithmeticPackage:"Basic arithmetic", lib, {
-    if cfg!(not(feature = "only_i32")) && cfg!(not(feature = "only_i64")) {
+    reg_functions!(lib += signed_basic; INT);
-        if cfg!(not(feature = "unchecked")) {
-            // Checked basic arithmetic
-            reg_op!(lib, "+", add, i8, u8, i16, u16, i32, u32, u64);
-            reg_op!(lib, "-", sub, i8, u8, i16, u16, i32, u32, u64);
-            reg_op!(lib, "*", mul, i8, u8, i16, u16, i32, u32, u64);
-            reg_op!(lib, "/", div, i8, u8, i16, u16, i32, u32, u64);
-            // Checked bit shifts
-            reg_op!(lib, "<<", shl, i8, u8, i16, u16, i32, u32, u64);
-            reg_op!(lib, ">>", shr, i8, u8, i16, u16, i32, u32, u64);
-            reg_op!(lib, "%", modulo, i8, u8, i16, u16, i32, u32, u64);
 
-            if cfg!(not(target_arch = "wasm32")) {
+    #[cfg(not(feature = "only_i32"))]
-                reg_op!(lib, "+", add, i128, u128);
+    #[cfg(not(feature = "only_i64"))]
-                reg_op!(lib, "-", sub, i128, u128);
-                reg_op!(lib, "*", mul, i128, u128);
-                reg_op!(lib, "/", div, i128, u128);
-                // Checked bit shifts
-                reg_op!(lib, "<<", shl, i128, u128);
-                reg_op!(lib, ">>", shr, i128, u128);
-                reg_op!(lib, "%", modulo, i128, u128);
-            }
-        }
-
-        if cfg!(feature = "unchecked") {
-            // Unchecked basic arithmetic
-            reg_op!(lib, "+", add_u, i8, u8, i16, u16, i32, u32, u64);
-            reg_op!(lib, "-", sub_u, i8, u8, i16, u16, i32, u32, u64);
-            reg_op!(lib, "*", mul_u, i8, u8, i16, u16, i32, u32, u64);
-            reg_op!(lib, "/", div_u, i8, u8, i16, u16, i32, u32, u64);
-            // Unchecked bit shifts
-            reg_op!(lib, "<<", shl_u, i64, i8, u8, i16, u16, i32, u32, u64);
-            reg_op!(lib, ">>", shr_u, i64, i8, u8, i16, u16, i32, u32, u64);
-            reg_op!(lib, "%", modulo_u, i8, u8, i16, u16, i32, u32, u64);
-
-            if cfg!(not(target_arch = "wasm32")) {
-                reg_op!(lib, "+", add_u, i128, u128);
-                reg_op!(lib, "-", sub_u, i128, u128);
-                reg_op!(lib, "*", mul_u, i128, u128);
-                reg_op!(lib, "/", div_u, i128, u128);
-                // Unchecked bit shifts
-                reg_op!(lib, "<<", shl_u, i128, u128);
-                reg_op!(lib, ">>", shr_u, i128, u128);
-                reg_op!(lib, "%", modulo_u, i128, u128);
-            }
-        }
-
-        reg_sign!(lib, "sign", INT, i8, i16, i32, i64);
-
-        if cfg!(not(target_arch = "wasm32")) {
-            reg_sign!(lib, "sign", INT, i128);
-        }
-    }
-
-    // Basic arithmetic for floating-point - no need to check
-    if cfg!(not(feature = "no_float")) {
-        reg_op!(lib, "+", add_u, f32);
-        reg_op!(lib, "-", sub_u, f32);
-        reg_op!(lib, "*", mul_u, f32);
-        reg_op!(lib, "/", div_u, f32);
-        reg_sign!(lib, "sign", f32, f32);
-        reg_sign!(lib, "sign", f64, f64);
-    }
-
-    if cfg!(not(feature = "only_i32")) && cfg!(not(feature = "only_i64")) {
-        reg_op!(lib, "|", binary_or, i8, u8, i16, u16, i32, u32, u64);
-        reg_op!(lib, "&", binary_and, i8, u8, i16, u16, i32, u32, u64);
-        reg_op!(lib, "^", binary_xor, i8, u8, i16, u16, i32, u32, u64);
-
-        if cfg!(not(target_arch = "wasm32")) {
-            reg_op!(lib, "|", binary_or, i128, u128);
-            reg_op!(lib, "&", binary_and, i128, u128);
-            reg_op!(lib, "^", binary_xor, i128, u128);
-        }
-    }
-
-    #[cfg(not(feature = "no_float"))]
     {
-        // Checked power
+        reg_functions!(lib += arith_numbers; i8, u8, i16, u16, i32, u32, u64);
-        if cfg!(not(feature = "unchecked")) {
+        reg_functions!(lib += signed_numbers; i8, i16, i32);
-            lib.set_fn_2("~", pow_f_i);
-        } else {
-            lib.set_fn_2("~", pow_f_i_u);
-        }
 
-        // Floating-point modulo and power
+        #[cfg(not(target_arch = "wasm32"))]
-        reg_op!(lib, "%", modulo_u, f32);
+        {
-
+            reg_functions!(lib += arith_num_128; i128, u128);
-        // Floating-point unary
+            reg_functions!(lib += signed_num_128; i128);
-        reg_unary!(lib, "-", neg_u, f32, f64);
-        reg_unary!(lib, "abs", abs_u, f32, f64);
-    }
-
-    // Checked unary
-    if cfg!(not(feature = "unchecked")) {
-        reg_unary!(lib, "-", neg, INT);
-        reg_unary!(lib, "abs", abs, INT);
-
-        if cfg!(not(feature = "only_i32")) && cfg!(not(feature = "only_i64")) {
-            reg_unary!(lib, "-", neg, i8, i16, i32, i64);
-            reg_unary!(lib, "abs", abs, i8, i16, i32, i64);
-
-            if cfg!(not(target_arch = "wasm32")) {
-                reg_unary!(lib, "-", neg, i128);
-                reg_unary!(lib, "abs", abs, i128);
-            }
         }
     }
 
-    // Unchecked unary
+    // Basic arithmetic for floating-point
-    if cfg!(feature = "unchecked") {
+    #[cfg(not(feature = "no_float"))]
-        reg_unary!(lib, "-", neg_u, INT);
+    lib.combine_flatten(exported_module!(float_functions));
-        reg_unary!(lib, "abs", abs_u, INT);
-
-        if cfg!(not(feature = "only_i32")) && cfg!(not(feature = "only_i64")) {
-            reg_unary!(lib, "-", neg_u, i8, i16, i32, i64);
-            reg_unary!(lib, "abs", abs_u, i8, i16, i32, i64);
-
-            if cfg!(not(target_arch = "wasm32")) {
-                reg_unary!(lib, "-", neg_u, i128);
-                reg_unary!(lib, "abs", abs_u, i128);
-            }
-        }
-    }
 });
+
+gen_arithmetic_functions!(arith_basic => INT);
+
+#[cfg(not(feature = "only_i32"))]
+#[cfg(not(feature = "only_i64"))]
+gen_arithmetic_functions!(arith_numbers => i8, u8, i16, u16, i32, u32, u64);
+
+#[cfg(not(feature = "only_i32"))]
+#[cfg(not(feature = "only_i64"))]
+#[cfg(not(target_arch = "wasm32"))]
+gen_arithmetic_functions!(arith_num_128 => i128, u128);
+
+gen_signed_functions!(signed_basic => INT);
+
+#[cfg(not(feature = "only_i32"))]
+#[cfg(not(feature = "only_i64"))]
+gen_signed_functions!(signed_numbers => i8, i16, i32);
+
+#[cfg(not(feature = "only_i32"))]
+#[cfg(not(feature = "only_i64"))]
+#[cfg(not(target_arch = "wasm32"))]
+gen_signed_functions!(signed_num_128 => i128);
+
+#[cfg(not(feature = "no_float"))]
+#[export_module]
+mod float_functions {
+    #[rhai_fn(name = "+")]
+    #[inline(always)]
+    pub fn add(x: f32, y: f32) -> f32 {
+        x + y
+    }
+    #[rhai_fn(name = "-")]
+    #[inline(always)]
+    pub fn subtract(x: f32, y: f32) -> f32 {
+        x - y
+    }
+    #[rhai_fn(name = "*")]
+    #[inline(always)]
+    pub fn multiply(x: f32, y: f32) -> f32 {
+        x * y
+    }
+    #[rhai_fn(name = "/")]
+    #[inline(always)]
+    pub fn divide(x: f32, y: f32) -> f32 {
+        x / y
+    }
+    #[rhai_fn(name = "%")]
+    #[inline(always)]
+    pub fn modulo(x: f32, y: f32) -> f32 {
+        x % y
+    }
+    #[rhai_fn(name = "-")]
+    #[inline(always)]
+    pub fn neg_f32(x: f32) -> f32 {
+        -x
+    }
+    #[rhai_fn(name = "-")]
+    #[inline(always)]
+    pub fn neg_f64(x: f64) -> f64 {
+        -x
+    }
+    #[rhai_fn(name = "abs")]
+    #[inline(always)]
+    pub fn abs_f32(x: f32) -> f32 {
+        x.abs()
+    }
+    #[rhai_fn(name = "abs")]
+    #[inline(always)]
+    pub fn abs_f64(x: f64) -> f64 {
+        x.abs()
+    }
+    #[rhai_fn(name = "sign")]
+    #[inline]
+    pub fn sign_f32(x: f32) -> INT {
+        if x == 0.0 {
+            0
+        } else if x < 0.0 {
+            -1
+        } else {
+            1
+        }
+    }
+    #[rhai_fn(name = "sign")]
+    #[inline]
+    pub fn sign_f64(x: f64) -> INT {
+        if x == 0.0 {
+            0
+        } else if x < 0.0 {
+            -1
+        } else {
+            1
+        }
+    }
+    #[rhai_fn(name = "~", return_raw)]
+    #[inline(always)]
+    pub fn pow_f_f(x: FLOAT, y: FLOAT) -> Result<Dynamic, Box<EvalAltResult>> {
+        Ok(x.powf(y).into())
+    }
+    #[rhai_fn(name = "~", return_raw)]
+    #[inline]
+    pub fn pow_f_i(x: FLOAT, y: INT) -> Result<Dynamic, Box<EvalAltResult>> {
+        if cfg!(not(feature = "unchecked")) && y > (i32::MAX as INT) {
+            EvalAltResult::ErrorArithmetic(
+                format!("Number raised to too large an index: {} ~ {}", x, y),
+                Position::none(),
+            )
+            .into()
+        } else {
+            Ok(x.powi(y as i32).into())
+        }
+    }
+}

src/packages/array_basic.rs

@@ -59,7 +59,7 @@ macro_rules! reg_pad {
 }
 
 def_package!(crate:BasicArrayPackage:"Basic array utilities.", lib, {
-    lib.combine(exported_module!(array_functions));
+    lib.combine_flatten(exported_module!(array_functions));
 
     reg_functions!(lib += basic; INT, bool, char, ImmutableString, FnPtr, Array, Unit);
     reg_pad!(lib, INT, bool, char, ImmutableString, FnPtr, Array, Unit);

src/packages/fn_basic.rs

@@ -3,7 +3,7 @@ use crate::fn_native::FnPtr;
 use crate::plugin::*;
 
 def_package!(crate:BasicFnPackage:"Basic Fn functions.", lib, {
-    lib.combine(exported_module!(fn_ptr_functions));
+    lib.combine_flatten(exported_module!(fn_ptr_functions));
 });
 
 #[export_module]

src/packages/logic.rs

@@ -47,7 +47,7 @@ macro_rules! gen_cmp_functions {
 
 macro_rules! reg_functions {
     ($mod_name:ident += $root:ident ; $($arg_type:ident),+) => {
-        $($mod_name.combine(exported_module!($root::$arg_type::functions));)*
+        $($mod_name.combine_flatten(exported_module!($root::$arg_type::functions));)*
     }
 }
 

src/packages/map_basic.rs

@@ -9,11 +9,7 @@ use crate::plugin::*;
 use crate::stdlib::vec::Vec;
 
 def_package!(crate:BasicMapPackage:"Basic object map utilities.", lib, {
-    lib.combine(exported_module!(map_functions));
+    lib.combine_flatten(exported_module!(map_functions));
-
-    // Register map access functions
-    #[cfg(not(feature = "no_index"))]
-    lib.combine(exported_module!(index_functions));
 });
 
 #[export_module]
@@ -63,15 +59,14 @@ mod map_functions {
             }
         });
     }
-}
 
-#[cfg(not(feature = "no_index"))]
+    #[cfg(not(feature = "no_index"))]
-#[export_module]
+    pub mod indexing {
-mod index_functions {
         pub fn keys(map: &mut Map) -> Vec<Dynamic> {
             map.iter().map(|(k, _)| k.clone().into()).collect()
         }
         pub fn values(map: &mut Map) -> Vec<Dynamic> {
             map.iter().map(|(_, v)| v.clone()).collect()
         }
+    }
 }

src/packages/math_basic.rs

@@ -1,3 +1,5 @@
+#![allow(non_snake_case)]
+
 use crate::def_package;
 use crate::parser::INT;
 use crate::plugin::*;
@@ -22,85 +24,58 @@ pub const MAX_INT: INT = i32::MAX;
 #[cfg(not(feature = "only_i32"))]
 pub const MAX_INT: INT = i64::MAX;
 
+macro_rules! gen_conversion_functions {
+    ($root:ident => $func_name:ident ( $($arg_type:ident),+ ) -> $result_type:ty) => {
+        pub mod $root { $(
+            pub mod $arg_type {
+                use super::super::*;
+
+                #[export_fn]
+                #[inline(always)]
+                pub fn $func_name(x: $arg_type) -> $result_type {
+                    x as $result_type
+                }
+            }
+        )* }
+    }
+}
+
+macro_rules! reg_functions {
+    ($mod_name:ident += $root:ident :: $func_name:ident ( $($arg_type:ident),+ ) ) => {
+        $(set_exported_fn!($mod_name, stringify!($func_name), $root::$arg_type::$func_name);)*
+    }
+}
+
 def_package!(crate:BasicMathPackage:"Basic mathematic functions.", lib, {
     #[cfg(not(feature = "no_float"))]
     {
         // Floating point functions
-        lib.combine(exported_module!(float_functions));
+        lib.combine_flatten(exported_module!(float_functions));
 
         // Trig functions
-        lib.combine(exported_module!(trig_functions));
+        lib.combine_flatten(exported_module!(trig_functions));
 
-        // Register conversion functions
+        reg_functions!(lib += basic_to_float::to_float(INT));
-        lib.set_fn_1("to_float", |x: INT| Ok(x as FLOAT));
-        lib.set_fn_1("to_float", |x: f32| Ok(x as FLOAT));
 
-        if cfg!(not(feature = "only_i32")) && cfg!(not(feature = "only_i64")) {
+        #[cfg(not(feature = "only_i32"))]
-            lib.set_fn_1("to_float", |x: i8| Ok(x as FLOAT));
+        #[cfg(not(feature = "only_i64"))]
-            lib.set_fn_1("to_float", |x: u8| Ok(x as FLOAT));
-            lib.set_fn_1("to_float", |x: i16| Ok(x as FLOAT));
-            lib.set_fn_1("to_float", |x: u16| Ok(x as FLOAT));
-            lib.set_fn_1("to_float", |x: i32| Ok(x as FLOAT));
-            lib.set_fn_1("to_float", |x: u32| Ok(x as FLOAT));
-            lib.set_fn_1("to_float", |x: i64| Ok(x as FLOAT));
-            lib.set_fn_1("to_float", |x: u64| Ok(x as FLOAT));
-
-            if cfg!(not(target_arch = "wasm32")) {
-                lib.set_fn_1("to_float", |x: i128| Ok(x as FLOAT));
-                lib.set_fn_1("to_float", |x: u128| Ok(x as FLOAT));
-            }
-        }
-    }
-
-    lib.set_fn_1("to_int", |ch: char| Ok(ch as INT));
-
-    if cfg!(not(feature = "only_i32")) && cfg!(not(feature = "only_i64")) {
-        lib.set_fn_1("to_int", |x: i8| Ok(x as INT));
-        lib.set_fn_1("to_int", |x: u8| Ok(x as INT));
-        lib.set_fn_1("to_int", |x: i16| Ok(x as INT));
-        lib.set_fn_1("to_int", |x: u16| Ok(x as INT));
-    }
-
-    if cfg!(not(feature = "only_i32")) {
-        lib.set_fn_1("to_int", |x: i32| Ok(x as INT));
-        lib.set_fn_1("to_int", |x: u64| Ok(x as INT));
-
-        if cfg!(feature = "only_i64") {
-            lib.set_fn_1("to_int", |x: u32| Ok(x as INT));
-        }
-    }
-
-    #[cfg(not(feature = "no_float"))]
         {
-        if cfg!(not(feature = "unchecked")) {
+            reg_functions!(lib += numbers_to_float::to_float(i8, u8, i16, u16, i32, u32, i64, u32));
-            lib.set_fn_1("to_int", |x: f32| {
+
-                if x > (MAX_INT as f32) {
+            #[cfg(not(target_arch = "wasm32"))]
-                    return EvalAltResult::ErrorArithmetic(
+            reg_functions!(lib += num_128_to_float::to_float(i128, u128));
-                        format!("Integer overflow: to_int({})", x),
+        }
-                        Position::none(),
-                    )
-                    .into();
     }
 
-                Ok(x.trunc() as INT)
+    reg_functions!(lib += basic_to_int::to_int(char));
-            });
-            lib.set_fn_1("to_int", |x: FLOAT| {
-                if x > (MAX_INT as FLOAT) {
-                    return EvalAltResult::ErrorArithmetic(
-                        format!("Integer overflow: to_int({})", x),
-                        Position::none(),
-                    )
-                    .into();
-                }
 
-                Ok(x.trunc() as INT)
+    #[cfg(not(feature = "only_i32"))]
-            });
+    #[cfg(not(feature = "only_i64"))]
-        }
+    {
+        reg_functions!(lib += numbers_to_int::to_int(i8, u8, i16, u16, i32, u32, i64, u64));
 
-        if cfg!(feature = "unchecked") {
+        #[cfg(not(target_arch = "wasm32"))]
-            lib.set_fn_1("to_int", |x: f32| Ok(x as INT));
+        reg_functions!(lib += num_128_to_int::to_int(i128, u128));
-            lib.set_fn_1("to_int", |x: f64| Ok(x as INT));
-        }
     }
 });
 
@@ -256,4 +231,55 @@ mod float_functions {
     pub fn is_infinite_prop(x: FLOAT) -> bool {
         is_infinite(x)
     }
+    #[rhai_fn(name = "to_int", return_raw)]
+    #[inline]
+    pub fn f32_to_int(x: f32) -> Result<Dynamic, Box<EvalAltResult>> {
+        if cfg!(not(feature = "unchecked")) && x > (MAX_INT as f32) {
+            EvalAltResult::ErrorArithmetic(
+                format!("Integer overflow: to_int({})", x),
+                Position::none(),
+            )
+            .into()
+        } else {
+            Ok((x.trunc() as INT).into())
+        }
+    }
+    #[rhai_fn(name = "to_int", return_raw)]
+    #[inline]
+    pub fn f64_to_int(x: f64) -> Result<Dynamic, Box<EvalAltResult>> {
+        if cfg!(not(feature = "unchecked")) && x > (MAX_INT as f64) {
+            EvalAltResult::ErrorArithmetic(
+                format!("Integer overflow: to_int({})", x),
+                Position::none(),
+            )
+            .into()
+        } else {
+            Ok((x.trunc() as INT).into())
+        }
+    }
 }
+
+#[cfg(not(feature = "no_float"))]
+gen_conversion_functions!(basic_to_float => to_float (INT) -> FLOAT);
+
+#[cfg(not(feature = "no_float"))]
+#[cfg(not(feature = "only_i32"))]
+#[cfg(not(feature = "only_i64"))]
+gen_conversion_functions!(numbers_to_float => to_float (i8, u8, i16, u16, i32, u32, i64, u64) -> FLOAT);
+
+#[cfg(not(feature = "no_float"))]
+#[cfg(not(feature = "only_i32"))]
+#[cfg(not(feature = "only_i64"))]
+#[cfg(not(target_arch = "wasm32"))]
+gen_conversion_functions!(num_128_to_float => to_float (i128, u128) -> FLOAT);
+
+gen_conversion_functions!(basic_to_int => to_int (char) -> INT);
+
+#[cfg(not(feature = "only_i32"))]
+#[cfg(not(feature = "only_i64"))]
+gen_conversion_functions!(numbers_to_int => to_int (i8, u8, i16, u16, i32, u32, i64, u64) -> INT);
+
+#[cfg(not(feature = "only_i32"))]
+#[cfg(not(feature = "only_i64"))]
+#[cfg(not(target_arch = "wasm32"))]
+gen_conversion_functions!(num_128_to_int => to_int (i128, u128) -> INT);

src/packages/string_more.rs

@@ -59,10 +59,7 @@ def_package!(crate:MoreStringPackage:"Additional string utilities, including str
     #[cfg(not(feature = "no_float"))]
     reg_functions!(lib += float; f32, f64);
 
-    #[cfg(not(feature = "no_index"))]
+    lib.combine_flatten(exported_module!(string_functions));
-    lib.combine(exported_module!(index_functions));
-
-    lib.combine(exported_module!(string_functions));
 
     lib.set_raw_fn(
         "pad",
@@ -343,11 +340,9 @@ mod string_functions {
     pub fn replace_char(s: &mut ImmutableString, find: char, sub: char) {
         *s = s.replace(&find.to_string(), &sub.to_string()).into();
     }
-}
 
-#[cfg(not(feature = "no_index"))]
+    #[cfg(not(feature = "no_index"))]
-#[export_module]
+    pub mod arrays {
-mod index_functions {
         use crate::engine::Array;
 
         #[rhai_fn(name = "+")]
@@ -360,4 +355,5 @@ mod index_functions {
         pub fn prepend(x: &mut Array, y: ImmutableString) -> String {
             format!("{:?}{}", x, y)
         }
+    }
 }

src/packages/time_basic.rs

@@ -26,7 +26,7 @@ use instant::Instant;
 
 def_package!(crate:BasicTimePackage:"Basic timing utilities.", lib, {
     // Register date/time functions
-    lib.combine(exported_module!(time_functions));
+    lib.combine_flatten(exported_module!(time_functions));
 });
 
 #[export_module]

src/parser.rs

@@ -133,7 +133,7 @@ impl AST {
         filter: impl Fn(FnAccess, &str, usize) -> bool,
     ) -> Self {
         let mut functions: Module = Default::default();
-        functions.merge_filtered(&self.1, filter);
+        functions.merge_filtered(&self.1, &filter);
         Self(Default::default(), functions)
     }
 
@@ -266,7 +266,7 @@ impl AST {
         };
 
         let mut functions = functions.clone();
-        functions.merge_filtered(&other.1, filter);
+        functions.merge_filtered(&other.1, &filter);
 
         Self::new(ast, functions)
     }

src/settings.rs

@@ -17,6 +17,7 @@ use crate::stdlib::boxed::Box;
 
 impl Engine {
     /// Load a new package into the `Engine`.
+    /// Anything that can be converted into a `PackageLibrary` is accepted, including a simple `Module`.
     ///
     /// When searching for functions, packages loaded later are preferred.
     /// In other words, loaded packages are searched in reverse order.

tests/compound_equality.rs

@@ -45,16 +45,16 @@ fn test_divide_equals() -> Result<(), Box<EvalAltResult>> {
 }
 
 #[test]
-fn test_left_shift_equals() -> Result<(), Box<EvalAltResult>> {
+fn test_right_shift_equals() -> Result<(), Box<EvalAltResult>> {
     let engine = Engine::new();
     assert_eq!(engine.eval::<INT>("let x = 9; x >>=1; x")?, 4);
     Ok(())
 }
 
 #[test]
-fn test_right_shift_equals() -> Result<(), Box<EvalAltResult>> {
+fn test_left_shift_equals() -> Result<(), Box<EvalAltResult>> {
     let engine = Engine::new();
-    assert_eq!(engine.eval::<INT>("let x = 4; x<<= 2; x")?, 16);
+    assert_eq!(engine.eval::<INT>("let x = 4; x <<= 2; x")?, 16);
     Ok(())
 }
 

tests/plugins.rs

@@ -10,11 +10,15 @@ mod test {
     pub mod special_array_package {
         use rhai::{Array, INT};
 
+        #[cfg(not(feature = "no_object"))]
+        pub mod feature {
             #[rhai_fn(get = "foo", return_raw)]
             #[inline(always)]
             pub fn foo(array: &mut Array) -> Result<Dynamic, Box<EvalAltResult>> {
                 Ok(array[0].clone())
             }
+        }
+
         #[rhai_fn(name = "test")]
         #[inline(always)]
         pub fn len(array: &mut Array, mul: INT) -> INT {
@@ -59,7 +63,8 @@ gen_unary_functions!(greet = make_greeting(INT, bool, char) -> String);
 fn test_plugins_package() -> Result<(), Box<EvalAltResult>> {
     let mut engine = Engine::new();
 
-    let m = exported_module!(test::special_array_package);
+    let mut m = Module::new();
+    m.combine_flatten(exported_module!(test::special_array_package));
     engine.load_package(m);
 
     reg_functions!(engine += greet::single(INT, bool, char));