mirror of
https://github.com/slint-ui/slint.git
synced 2025-08-04 10:50:00 +00:00
Fix compiler crash when const propagating a property of component-factory
with its default value
We couldn't represent an empty component factory in the exrpession tree, so add Expression::EmptyComponentFactory for that
This commit is contained in:
parent
bc35d49328
commit
bd18d8dc0a
9 changed files with 24 additions and 2 deletions
|
@ -737,6 +737,8 @@ pub enum Expression {
|
|||
lhs: Box<Expression>,
|
||||
rhs: Box<Expression>,
|
||||
},
|
||||
|
||||
EmptyComponentFactory,
|
||||
}
|
||||
|
||||
impl Expression {
|
||||
|
@ -864,6 +866,7 @@ impl Expression {
|
|||
Expression::ComputeLayoutInfo(..) => crate::layout::layout_info_type(),
|
||||
Expression::SolveLayout(..) => Type::LayoutCache,
|
||||
Expression::MinMax { ty, .. } => ty.clone(),
|
||||
Expression::EmptyComponentFactory => Type::ComponentFactory,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -966,6 +969,7 @@ impl Expression {
|
|||
visitor(lhs);
|
||||
visitor(rhs);
|
||||
}
|
||||
Expression::EmptyComponentFactory => {}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1070,6 +1074,7 @@ impl Expression {
|
|||
visitor(lhs);
|
||||
visitor(rhs);
|
||||
}
|
||||
Expression::EmptyComponentFactory => {}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1148,6 +1153,7 @@ impl Expression {
|
|||
Expression::ComputeLayoutInfo(..) => false,
|
||||
Expression::SolveLayout(..) => false,
|
||||
Expression::MinMax { lhs, rhs, .. } => lhs.is_constant() && rhs.is_constant(),
|
||||
Expression::EmptyComponentFactory => true,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1334,7 +1340,6 @@ impl Expression {
|
|||
match ty {
|
||||
Type::Invalid
|
||||
| Type::Callback { .. }
|
||||
| Type::ComponentFactory
|
||||
| Type::Function { .. }
|
||||
| Type::InferredProperty
|
||||
| Type::InferredCallback
|
||||
|
@ -1379,6 +1384,7 @@ impl Expression {
|
|||
Type::Enumeration(enumeration) => {
|
||||
Expression::EnumerationValue(enumeration.clone().default_value())
|
||||
}
|
||||
Type::ComponentFactory => Expression::EmptyComponentFactory,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1781,5 +1787,6 @@ pub fn pretty_print(f: &mut dyn std::fmt::Write, expression: &Expression) -> std
|
|||
pretty_print(f, rhs)?;
|
||||
write!(f, ")")
|
||||
}
|
||||
Expression::EmptyComponentFactory => write!(f, "<empty-component-factory>"),
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue