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

Reduce size of scope entry.

Browse Source
This commit is contained in:
Stephen Chung 2020-04-27 21:14:34 +08:00
parent 43fdf3f962
commit c2bb1f48c2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/optimize.rs
View File

@ -646,12 +646,12 @@ fn optimize<'a>(
.filter(|ScopeEntry { typ, expr, .. }| {
// Get all the constants with definite constant expressions
*typ == ScopeEntryType::Constant
&& expr.as_ref().map(Expr::is_constant).unwrap_or(false)
&& expr.as_ref().map(|v| v.is_constant()).unwrap_or(false)
})
.for_each(|ScopeEntry { name, expr, .. }| {
state.push_constant(
name.as_ref(),
expr.as_ref().expect("should be Some(expr)").clone(),
(**expr.as_ref().expect("should be Some(expr)")).clone(),
)
});

4
src/scope.rs
View File

@ -25,7 +25,7 @@ pub struct Entry<'a> {
/// Current value of the entry.
pub value: Dynamic,
/// A constant expression if the initial value matches one of the recognized types.
pub expr: Option<Expr>,
pub expr: Option<Box<Expr>>,
}
/// Information about a particular entry in the Scope.
@ -227,7 +227,7 @@ impl<'a> Scope<'a> {
map_expr: bool,
) {
let expr = if map_expr {
map_dynamic_to_expr(value.clone(), Position::none())
map_dynamic_to_expr(value.clone(), Position::none()).map(Box::new)
} else {
None
};