Rename struct priperties to fields

This commit is contained in:
Olivier Goffart 2021-03-16 12:50:33 +01:00
parent 3db3400951
commit ad75d41e20
3 changed files with 14 additions and 16 deletions

View file

@ -173,7 +173,7 @@ pub fn eval_expression(e: &Expression, local_context: &mut EvalLocalContext) ->
}
Expression::StructFieldAccess { base, name } => {
if let Value::Struct(o) = eval_expression(base, local_context) {
o.get_property(name).unwrap_or(Value::Void)
o.get_field(name).unwrap_or(Value::Void)
} else {
Value::Void
}
@ -580,9 +580,9 @@ fn eval_assignement(lhs: &Expression, op: char, rhs: Value, local_context: &mut
}
Expression::StructFieldAccess { base, name } => {
if let Value::Struct(mut o) = eval_expression(base, local_context) {
let mut r = o.get_property(name).unwrap();
let mut r = o.get_field(name).unwrap();
r = if op == '=' { rhs } else { eval(std::mem::take(&mut r)) };
o.set_property(name.to_owned(), r);
o.set_field(name.to_owned(), r);
eval_assignement(base, '=', Value::Struct(o), local_context)
}
}