language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-10-01 14:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

WIP: Implement the return statement

Browse source
This commit is contained in:
Simon Hausmann 2020-12-04 13:46:35 +01:00 • committed by Olivier Goffart
parent 16a75a2ff8
commit b22bbb1c0f
6 changed files with 128 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
sixtyfps_compiler/expression_tree.rs
View file

@ -363,6 +363,8 @@ pub enum Expression {
EasingCurve(EasingCurve),
EnumerationValue(EnumerationValue),
ReturnStatement(Option<Box<Expression>>),
}
impl Default for Expression {
@ -469,6 +471,7 @@ impl Expression {
Expression::ReadLocalVariable { ty, .. } => ty.clone(),
Expression::EasingCurve(_) => Type::Easing,
Expression::EnumerationValue(value) => Type::Enumeration(value.enumeration.clone()),
Expression::ReturnStatement(expr) => expr.as_ref().map_or(Type::Void, |expr| expr.ty()),
}
}
@ -542,6 +545,9 @@ impl Expression {
Expression::ReadLocalVariable { .. } => {}
Expression::EasingCurve(_) => {}
Expression::EnumerationValue(_) => {}
Expression::ReturnStatement(expr) => {
expr.as_deref().map(|expr| visitor(expr));
}
}
}
@ -614,6 +620,9 @@ impl Expression {
Expression::ReadLocalVariable { .. } => {}
Expression::EasingCurve(_) => {}
Expression::EnumerationValue(_) => {}
Expression::ReturnStatement(expr) => {
expr.as_deref_mut().map(|expr| visitor(expr));
}
}
}
@ -666,6 +675,9 @@ impl Expression {
Expression::ReadLocalVariable { .. } => false,
Expression::EasingCurve(_) => true,
Expression::EnumerationValue(_) => true,
Expression::ReturnStatement(expr) => {
expr.as_ref().map_or(true, |expr| expr.is_constant())
}
}
}
@ -676,6 +688,13 @@ impl Expression {
node: &impl SpannedWithSourceFile,
diag: &mut BuildDiagnostics,
) -> Expression {
if let Expression::ReturnStatement(expr) = self {
return Expression::ReturnStatement(expr.map(|mut expr| {
let expr = std::mem::replace(&mut *expr, Expression::Invalid);
Box::new(expr.maybe_convert_to(target_type, node, diag))
}));
}
let ty = self.ty();
if ty == target_type || target_type == Type::Void || target_type == Type::Invalid {
self