Check data size at built-in.

src/eval/data_check.rs

@@ -73,14 +73,15 @@ impl Engine {
     pub(crate) fn raise_err_if_over_data_size_limit(
         &self,
         (_arr, _map, s): (usize, usize, usize),
-        pos: Position,
     ) -> RhaiResultOf<()> {
         if self
             .limits
             .max_string_size
             .map_or(false, |max| s > max.get())
         {
-            return Err(ERR::ErrorDataTooLarge("Length of string".to_string(), pos).into());
+            return Err(
+                ERR::ErrorDataTooLarge("Length of string".to_string(), Position::NONE).into(),
+            );
         }
 
         #[cfg(not(feature = "no_index"))]
@@ -89,7 +90,9 @@ impl Engine {
             .max_array_size
             .map_or(false, |max| _arr > max.get())
         {
-            return Err(ERR::ErrorDataTooLarge("Size of array".to_string(), pos).into());
+            return Err(
+                ERR::ErrorDataTooLarge("Size of array/BLOB".to_string(), Position::NONE).into(),
+            );
         }
 
         #[cfg(not(feature = "no_object"))]
@@ -98,7 +101,9 @@ impl Engine {
             .max_map_size
             .map_or(false, |max| _map > max.get())
         {
-            return Err(ERR::ErrorDataTooLarge("Size of object map".to_string(), pos).into());
+            return Err(
+                ERR::ErrorDataTooLarge("Size of object map".to_string(), Position::NONE).into(),
+            );
         }
 
         Ok(())
@@ -113,7 +118,8 @@ impl Engine {
 
         let sizes = Self::calc_data_sizes(value, true);
 
-        self.raise_err_if_over_data_size_limit(sizes, pos)
+        self.raise_err_if_over_data_size_limit(sizes)
+            .map_err(|err| err.fill_position(pos))
     }
 
     /// Raise an error if the size of a [`Dynamic`] is out of limits (if any).

src/eval/expr.rs

@@ -252,8 +252,7 @@ impl Engine {
             {
                 // Built-in found
                 let context = (self, name, None, &*global, lib, pos, level + 1).into();
-                let result = func(context, operands);
-                return self.check_return_value(result, pos);
+                return func(context, operands);
             }
 
             return self
@@ -422,10 +421,8 @@ impl Engine {
                                     total_data_sizes.1 + val_sizes.1,
                                     total_data_sizes.2 + val_sizes.2,
                                 );
-                                self.raise_err_if_over_data_size_limit(
-                                    total_data_sizes,
-                                    item_expr.position(),
-                                )?;
+                                self.raise_err_if_over_data_size_limit(total_data_sizes)
+                                    .map_err(|err| err.fill_position(item_expr.position()))?;
                             }
 
                             array.push(value);
@@ -455,10 +452,8 @@ impl Engine {
                                 total_data_sizes.1 + delta.1,
                                 total_data_sizes.2 + delta.2,
                             );
-                            self.raise_err_if_over_data_size_limit(
-                                total_data_sizes,
-                                value_expr.position(),
-                            )?;
+                            self.raise_err_if_over_data_size_limit(total_data_sizes)
+                                .map_err(|err| err.fill_position(value_expr.position()))?;
                         }
 
                         *map.get_mut(key.as_str()).unwrap() = value;

src/eval/stmt.rs

@@ -146,11 +146,7 @@ impl Engine {
                     // Built-in found
                     let op = op_assign.literal_syntax();
                     let context = (self, op, None, &*global, lib, *op_pos, level).into();
-                    let result = func(context, args).map(|_| ());
-
-                    self.check_data_size(args[0], root.1)?;
-
-                    return result;
+                    return func(context, args).map(|_| ());
                 }
             }