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

Classes - Refactored super handling

Browse source
This commit is contained in:
Emmanuel BENOîT 2023-01-17 07:13:09 +01:00
parent f29902b210
commit b01ae10d09
1 changed files with 45 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
src/interpreter/classes.rs
View file

@ -48,9 +48,9 @@ pub struct Instance {
/// Helper type used to refer to instances.
pub type InstanceRef = Rc<RefCell<Instance>>;
/* -------------------- *
* Class implementation *
* -------------------- */
/* --------------- *
* Various helpers *
* --------------- */
lazy_static! {
static ref INIT_METHOD_KEY: ClassMemberKey =
@ -63,6 +63,46 @@ fn bind_method(method: &Function, this_value: Value) -> Function {
bm
}
fn get_super<T>(
on_ref: &T,
is_static: bool,
itpr_state: &mut InterpreterState,
super_expr: &SuperExpr,
distance: usize,
) -> SloxResult<Value>
where
T: Clone + Into<Value>,
{
let mb_key = (
ClassMemberKind::Method,
is_static,
super_expr.method.lexeme.clone(),
);
let sc_value = itpr_state
.environment
.borrow()
.get_at(distance, &super_expr.keyword.token)?;
let class = sc_value.as_class_ref().expect("class reference expected");
if let Some(method) = with_class_member(&class, &mb_key, |method| {
let bound_method = bind_method(method, on_ref.clone().into());
Ok(Value::from(bound_method))
}) {
method
} else {
Err(SloxError::with_token(
ErrorKind::Runtime,
&super_expr.method,
"undefined property".to_owned(),
))
}
}
/* -------------------- *
* Class implementation *
* -------------------- */
impl Class {
/// Create a new class, specifying its name.
pub fn new(
@ -192,30 +232,7 @@ impl PropertyCarrier for ClassRef {
super_expr: &SuperExpr,
distance: usize,
) -> SloxResult<Value> {
let mb_key = (
ClassMemberKind::Method,
true,
super_expr.method.lexeme.clone(),
);
let sc_value = itpr_state
.environment
.borrow()
.get_at(distance, &super_expr.keyword.token)?;
let class = sc_value.as_class_ref().expect("class reference expected");
if let Some(method) = with_class_member(&class, &mb_key, |method| {
let bound_method = bind_method(method, Value::from(self.clone()));
Ok(Value::from(bound_method))
}) {
method
} else {
Err(SloxError::with_token(
ErrorKind::Runtime,
&super_expr.method,
"undefined property".to_owned(),
))
}
get_super(self, true, itpr_state, super_expr, distance)
}
}
@ -300,29 +317,6 @@ impl PropertyCarrier for InstanceRef {
super_expr: &SuperExpr,
distance: usize,
) -> SloxResult<Value> {
let mb_key = (
ClassMemberKind::Method,
false,
super_expr.method.lexeme.clone(),
);
let sc_value = itpr_state
.environment
.borrow()
.get_at(distance, &super_expr.keyword.token)?;
let class = sc_value.as_class_ref().expect("class reference expected");
if let Some(method) = with_class_member(&class, &mb_key, |method| {
let bound_method = bind_method(method, Value::from(self.clone()));
Ok(Value::from(bound_method))
}) {
method
} else {
Err(SloxError::with_token(
ErrorKind::Runtime,
&super_expr.method,
"undefined property".to_owned(),
))
}
get_super(self, false, itpr_state, super_expr, distance)
}
}