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

Resolver - Refactored to work with the new class structure

Browse source
This commit is contained in:
Emmanuel BENOîT 2023-01-12 08:41:04 +01:00
parent 0dbc631c96
commit 599652e98e
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/resolver.rs
View file

@ -1,7 +1,7 @@
use std::collections::HashMap;
use crate::{
ast::{ExprNode, FunDecl, ProgramNode, StmtNode, VariableExpr},
ast::{ClassMemberDecl, ExprNode, FunDecl, ProgramNode, StmtNode, VariableExpr},
errors::{ErrorKind, SloxError, SloxResult},
tokens::Token,
};
@ -266,20 +266,23 @@ where
}
/// Process all method definitions in a class.
fn resolve_class<'a, 'b>(rs: &mut ResolverState<'a>, methods: &'b [FunDecl]) -> ResolverResult
fn resolve_class<'a, 'b>(
rs: &mut ResolverState<'a>,
methods: &'b [ClassMemberDecl],
) -> ResolverResult
where
'b: 'a,
{
rs.define_this();
methods.iter().try_for_each(|method| {
rs.with_scope(
methods.iter().try_for_each(|member| match member {
ClassMemberDecl::Method(method) | ClassMemberDecl::StaticMethod(method) => rs.with_scope(
|rs| resolve_function(rs, &method.params, &method.body),
if method.name.lexeme == "init" {
ScopeType::Initializer
} else {
ScopeType::Method
},
)
),
})
}
@ -343,7 +346,7 @@ impl VarResolver for StmtNode {
StmtNode::ClassDecl(decl) => {
rs.declare(&decl.name, SymKind::Class)?;
rs.define(&decl.name);
rs.with_scope(|rs| resolve_class(rs, &decl.methods), rs.current_type())
rs.with_scope(|rs| resolve_class(rs, &decl.members), rs.current_type())
}
StmtNode::If {