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

Revert "Refine examples."

Browse Source 
This reverts commit 146129279c.
This commit is contained in:
Stephen Chung
2022-01-16 22:50:39 +08:00
parent 146129279c
commit 5935a88958
6 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/eval/chaining.rs
View File

@@ -1,7 +1,7 @@
//! Types to support chaining operations (i.e. indexing and dotting).
#![cfg(any(not(feature = "no_index"), not(feature = "no_object")))]
use super::{EvalState, GlobalRuntimeState, Target};
use super::{calc_index, EvalState, GlobalRuntimeState, Target};
use crate::ast::{Expr, OpAssignment};
use crate::types::dynamic::Union;
use crate::{Dynamic, Engine, Module, Position, RhaiResult, RhaiResultOf, Scope, StaticVec, ERR};
@@ -790,7 +790,7 @@ impl Engine {
.as_int()
.map_err(|typ| self.make_type_mismatch_err::<crate::INT>(typ, pos))?;
let len = arr.len();
let arr_idx = super::calc_index(len, index, true, || {
let arr_idx = calc_index(len, index, true, || {
ERR::ErrorArrayBounds(len, index, pos).into()
})?;
@@ -804,7 +804,7 @@ impl Engine {
.as_int()
.map_err(|typ| self.make_type_mismatch_err::<crate::INT>(typ, pos))?;
let len = arr.len();
let arr_idx = super::calc_index(len, index, true, || {
let arr_idx = calc_index(len, index, true, || {
ERR::ErrorArrayBounds(len, index, pos).into()
})?;
@@ -845,10 +845,10 @@ impl Engine {
let start = range.start;
let end = range.end;
let start = super::calc_index(BITS, start, false, || {
let start = calc_index(BITS, start, false, || {
ERR::ErrorBitFieldBounds(BITS, start, pos).into()
})?;
let end = super::calc_index(BITS, end, false, || {
let end = calc_index(BITS, end, false, || {
ERR::ErrorBitFieldBounds(BITS, end, pos).into()
})?;
@@ -870,10 +870,10 @@ impl Engine {
let start = *range.start();
let end = *range.end();
let start = super::calc_index(BITS, start, false, || {
let start = calc_index(BITS, start, false, || {
ERR::ErrorBitFieldBounds(BITS, start, pos).into()
})?;
let end = super::calc_index(BITS, end, false, || {
let end = calc_index(BITS, end, false, || {
ERR::ErrorBitFieldBounds(BITS, end, pos).into()
})?;
@@ -914,7 +914,7 @@ impl Engine {
const BITS: usize = std::mem::size_of::<crate::INT>() * 8;
let bit = super::calc_index(BITS, index, true, || {
let bit = calc_index(BITS, index, true, || {
ERR::ErrorBitFieldBounds(BITS, index, pos).into()
})?;

12
src/eval/target.rs
View File

@@ -1,7 +1,7 @@
//! Type to hold a mutable reference to the target of an evaluation.
use crate::types::dynamic::Variant;
use crate::{Dynamic, RhaiResultOf};
use crate::{Dynamic, RhaiResultOf, INT};
use std::ops::{Deref, DerefMut};
#[cfg(feature = "no_std")]
use std::prelude::v1::*;
@@ -11,9 +11,8 @@ use std::prelude::v1::*;
// Negative starting positions count from the end.
//
// Values going over bounds are limited to the actual length.
#[inline]
#[allow(dead_code)]
pub fn calc_offset_len(length: usize, start: crate::INT, len: crate::INT) -> (usize, usize) {
#[inline(always)]
pub fn calc_offset_len(length: usize, start: INT, len: INT) -> (usize, usize) {
let start = if start < 0 {
start.checked_abs().map_or(0, |positive_start| {
length - usize::min(positive_start as usize, length)
@@ -40,11 +39,10 @@ pub fn calc_offset_len(length: usize, start: crate::INT, len: crate::INT) -> (us
// Negative starting positions count from the end.
//
// Values going over bounds call the provided closure to return a default value or an error.
#[inline]
#[allow(dead_code)]
#[inline(always)]
pub fn calc_index<E>(
length: usize,
start: crate::INT,
start: INT,
negative_count_from_end: bool,
err: impl Fn() -> Result<usize, E>,
) -> Result<usize, E> {