tseeker-pub/rust-crafting-interpreters-part-1
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Interpreter - Implemented new version of the loop statement

Browse source
This commit is contained in:
Emmanuel BENOîT 2023-01-02 12:18:00 +01:00
parent 4c54643a8d
commit 2f0798bfe1
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/interpreter/interpretable.rs
View file

@ -94,11 +94,12 @@ impl Interpretable for ast::StmtNode {
then_branch,
else_branch,
} => self.on_if_statement(environment, condition, then_branch, else_branch),
ast::StmtNode::WhileStmt {
ast::StmtNode::LoopStmt {
label,
condition,
body,
} => self.on_while_statement(environment, label, condition, body),
after_body
} => self.on_loop_statement(environment, label, condition, body, after_body),
ast::StmtNode::LoopControlStmt {
is_break,
loop_name,
@ -171,12 +172,13 @@ impl ast::StmtNode {
}
/// Execute a while statement.
fn on_while_statement(
fn on_loop_statement(
&self,
environment: &EnvironmentRef,
label: &Option<Token>,
condition: &ast::ExprNode,
body: &ast::StmtNode,
after_body: &Option<Box<ast::StmtNode>>,
) -> InterpreterResult {
let ln = match label {
None => None,
@ -190,6 +192,15 @@ impl ast::StmtNode {
InterpreterFlowControl::Break(lv) if lv == &ln => break,
_ => return Ok(result),
}
if let Some(stmt) = after_body {
let result = stmt.interprete(environment)?;
match &result {
InterpreterFlowControl::Result(_) => (),
InterpreterFlowControl::Continue(lv) if lv == &ln => (),
InterpreterFlowControl::Break(lv) if lv == &ln => break,
_ => return Ok(result),
}
}
}
Ok(InterpreterFlowControl::default())
}