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

Fix optimization of Stmt::Expr.

Browse Source
This commit is contained in:
Stephen Chung 2020-11-04 13:11:37 +08:00
parent c287a61b93
commit b390586bcc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/optimize.rs
View File

@ -408,15 +408,15 @@ fn optimize_stmt(stmt: Stmt, state: &mut State, preserve_result: bool) -> Stmt {
pos, pos,
))) )))
} }
// expr; // {}
Stmt::Expr(Expr::Stmt(x, pos)) if x.is_empty() => { Stmt::Expr(Expr::Stmt(x, pos)) if x.is_empty() => {
state.set_dirty(); state.set_dirty();
Stmt::Noop(pos) Stmt::Noop(pos)
} }
// expr; // {...};
Stmt::Expr(Expr::Stmt(mut x, _)) if x.len() == 1 => { Stmt::Expr(Expr::Stmt(x, pos)) => {
state.set_dirty(); state.set_dirty();
optimize_stmt(x.remove(0), state, preserve_result) Stmt::Block(x.into_vec(), pos)
} }
// expr; // expr;
Stmt::Expr(expr) => Stmt::Expr(optimize_expr(expr, state)), Stmt::Expr(expr) => Stmt::Expr(optimize_expr(expr, state)),
@ -449,7 +449,7 @@ fn optimize_expr(expr: Expr, state: &mut State) -> Expr {
Expr::Unit(pos) Expr::Unit(pos)
} }
// { stmt } // { stmt }
Expr::Stmt(mut x, pos) if x.len() == 1 => match x.remove(0) { Expr::Stmt(mut x, pos) if x.len() == 1 => match x.pop().unwrap() {
// {} -> () // {} -> ()
Stmt::Noop(_) => { Stmt::Noop(_) => {
state.set_dirty(); state.set_dirty();