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

Resolver - resolve_function() shouldn't be a method from ResolverState

Browse source
This commit is contained in:
Emmanuel BENOîT 2023-01-05 07:09:35 +01:00
parent b5573cee3b
commit 64bc8312dd
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/resolver.rs
View file

@ -75,26 +75,27 @@ impl ResolverState {
}
}
fn resolve_function(&mut self, params: &[Token], body: &Vec<ast::StmtNode>) -> ResolverResult {
self.begin_scope();
for param in params {
self.declare(param)?;
self.define(param);
}
// Unlike the original Lox, function arguments and function bodies do
// not use the same environment.
self.begin_scope();
let result = body.resolve(self);
self.end_scope();
self.end_scope();
result
}
fn mark_resolved(&mut self, expr: &ast::ExprNode, depth: usize) {
self.resolved.insert(expr as *const ast::ExprNode, depth);
}
}
/// Process a function declaration.
fn resolve_function(rs: &mut ResolverState, params: &[Token], body: &Vec<ast::StmtNode>) -> ResolverResult {
rs.begin_scope();
for param in params {
rs.declare(param)?;
rs.define(param);
}
// Unlike the original Lox, function arguments and function bodies do
// not use the same environment.
rs.begin_scope();
let result = body.resolve(rs);
rs.end_scope();
rs.end_scope();
result
}
trait VarResolver {
fn resolve(&self, rs: &mut ResolverState) -> ResolverResult;
}
@ -142,7 +143,7 @@ impl VarResolver for ast::StmtNode {
ast::StmtNode::FunDecl { name, params, body } => {
rs.declare(name)?;
rs.define(name);
rs.resolve_function(params, body)
resolve_function(rs, params, body)
}
ast::StmtNode::If {
@ -216,7 +217,7 @@ impl VarResolver for ast::ExprNode {
Ok(())
}
ast::ExprNode::Lambda { params, body } => rs.resolve_function(params, body),
ast::ExprNode::Lambda { params, body } => resolve_function(rs, params, body),
ast::ExprNode::Logical {
left,