Better function parameter names.
This commit is contained in:
@@ -1235,13 +1235,14 @@ impl Engine {
|
||||
target: &mut Target,
|
||||
root: (&str, Position),
|
||||
rhs: &Expr,
|
||||
_terminate_chaining: bool,
|
||||
terminate_chaining: bool,
|
||||
idx_values: &mut StaticVec<ChainArgument>,
|
||||
chain_type: ChainType,
|
||||
level: usize,
|
||||
new_val: Option<((Dynamic, Position), (Option<OpAssignment>, Position))>,
|
||||
) -> Result<(Dynamic, bool), Box<EvalAltResult>> {
|
||||
let is_ref_mut = target.is_ref();
|
||||
let _terminate_chaining = terminate_chaining;
|
||||
|
||||
// Pop the last index value
|
||||
let idx_val = idx_values
|
||||
@@ -1725,7 +1726,7 @@ impl Engine {
|
||||
this_ptr: &mut Option<&mut Dynamic>,
|
||||
expr: &Expr,
|
||||
terminate_chaining: bool,
|
||||
_parent_chain_type: ChainType,
|
||||
parent_chain_type: ChainType,
|
||||
idx_values: &mut StaticVec<ChainArgument>,
|
||||
size: usize,
|
||||
level: usize,
|
||||
@@ -1733,6 +1734,8 @@ impl Engine {
|
||||
#[cfg(not(feature = "unchecked"))]
|
||||
self.inc_operations(state, expr.position())?;
|
||||
|
||||
let _parent_chain_type = parent_chain_type;
|
||||
|
||||
match expr {
|
||||
#[cfg(not(feature = "no_object"))]
|
||||
Expr::FnCall(x, _) if _parent_chain_type == ChainType::Dotting && !x.is_qualified() => {
|
||||
@@ -1848,15 +1851,18 @@ impl Engine {
|
||||
state: &mut EvalState,
|
||||
lib: &[&Module],
|
||||
target: &'t mut Dynamic,
|
||||
mut idx: Dynamic,
|
||||
idx: Dynamic,
|
||||
idx_pos: Position,
|
||||
_create: bool,
|
||||
indexers: bool,
|
||||
add_if_not_found: bool,
|
||||
use_indexers: bool,
|
||||
level: usize,
|
||||
) -> Result<Target<'t>, Box<EvalAltResult>> {
|
||||
#[cfg(not(feature = "unchecked"))]
|
||||
self.inc_operations(state, Position::NONE)?;
|
||||
|
||||
let mut idx = idx;
|
||||
let _add_if_not_found = add_if_not_found;
|
||||
|
||||
match target {
|
||||
#[cfg(not(feature = "no_index"))]
|
||||
Dynamic(Union::Array(arr, _, _)) => {
|
||||
@@ -1907,7 +1913,7 @@ impl Engine {
|
||||
self.make_type_mismatch_err::<ImmutableString>(idx.type_name(), idx_pos)
|
||||
})?;
|
||||
|
||||
if _create && !map.contains_key(index.as_str()) {
|
||||
if _add_if_not_found && !map.contains_key(index.as_str()) {
|
||||
map.insert(index.clone().into(), Default::default());
|
||||
}
|
||||
|
||||
@@ -1988,7 +1994,7 @@ impl Engine {
|
||||
Ok(Target::StringChar(target, offset, ch.into()))
|
||||
}
|
||||
|
||||
_ if indexers => {
|
||||
_ if use_indexers => {
|
||||
let args = &mut [target, &mut idx];
|
||||
let hash_get = FnCallHashes::from_native(crate::calc_fn_hash(FN_IDX_GET, 2));
|
||||
let idx_pos = Position::NONE;
|
||||
@@ -2298,13 +2304,15 @@ impl Engine {
|
||||
op_pos: Position,
|
||||
target: &mut Target,
|
||||
root: (&str, Position),
|
||||
mut new_val: Dynamic,
|
||||
new_val: Dynamic,
|
||||
) -> Result<(), Box<EvalAltResult>> {
|
||||
if target.is_read_only() {
|
||||
// Assignment to constant variable
|
||||
return EvalAltResult::ErrorAssignmentToConstant(root.0.to_string(), root.1).into();
|
||||
}
|
||||
|
||||
let mut new_val = new_val;
|
||||
|
||||
if let Some(OpAssignment {
|
||||
hash_op_assign,
|
||||
hash_op,
|
||||
|
Reference in New Issue
Block a user