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

Improve position display.

Browse Source
This commit is contained in:
Stephen Chung
2022-02-04 12:04:33 +08:00
parent 345a060672
commit 6c1c8bc538
11 changed files with 212 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/eval/expr.rs
View File

@@ -148,7 +148,7 @@ impl Engine {
Err(ERR::ErrorUnboundThis(*pos).into())
}
}
_ if state.always_search_scope => (0, expr.position()),
_ if state.always_search_scope => (0, expr.start_position()),
Expr::Variable(Some(i), pos, _) => (i.get() as usize, *pos),
Expr::Variable(None, pos, v) => (v.0.map(NonZeroUsize::get).unwrap_or(0), *pos),
_ => unreachable!("Expr::Variable expected but gets {:?}", expr),
@@ -347,11 +347,11 @@ impl Engine {
item,
level,
) {
result = Err(err.fill_position(expr.position()));
result = Err(err.fill_position(expr.start_position()));
break;
}
pos = expr.position();
pos = expr.start_position();
}
result.map(|_| concat)
@@ -504,7 +504,7 @@ impl Engine {
let result = (custom_def.func)(&mut context, &expressions);
self.check_return_value(result, expr.position())
self.check_return_value(result, expr.start_position())
}
Expr::Stmt(x) if x.is_empty() => Ok(Dynamic::UNIT),