Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
227 changes: 187 additions & 40 deletions crates/pyrefly_types/src/type_level_dsl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,14 @@ pub enum TypeShapeDslInputDomain {
NamedInts,
}

/// The domain accepted by scalar and sequence narrowing operations. Boolean conditions are
/// validated separately against `Flag[bool]`.
pub fn type_shape_dsl_narrowable_flag_domain() -> FlagDomain {
FlagDomain::of(FlagMember::Int)
.join(FlagDomain::of(FlagMember::IntTuple))
.join(FlagDomain::of(FlagMember::NoneType))
}

impl TypeShapeDslInputDomain {
/// Whether a parameter in this domain may be used as a value in `result` after narrowing.
pub fn can_use_as(
Expand All @@ -135,6 +143,44 @@ impl TypeShapeDslInputDomain {
&& narrowing.proves_not_none())
}

/// Which integer domain a parameter in this domain belongs to after `narrowing`, if any.
pub fn integer_domain(
self,
narrowing: TypeShapeDslParameterNarrowing,
) -> Option<DslIntegerDomain> {
if self.can_use_as(TypeShapeDslDomain::Int, narrowing) {
return Some(DslIntegerDomain::Dimension);
}
let Self::Flag(domain) = self else {
return None;
};
let is_flag_int = if narrowing == TypeShapeDslParameterNarrowing::Integer {
// Any domain accepted by `dsl.is_int_value(...)` (`int | tuple[int, ...] | None` or a
// subset like `tuple[int, ...] | None`) may be used as `Flag[int]` inside the narrowed
// branch; if `int` wasn't in the declared union, that branch is simply dead at runtime.
domain.is_subset_of(type_shape_dsl_narrowable_flag_domain())
} else {
narrowing != TypeShapeDslParameterNarrowing::IsNone
&& domain == FlagDomain::of(FlagMember::Int)
};
is_flag_int.then_some(DslIntegerDomain::Flag)
}

fn shared_integer_domain(
parameter_domains: &[Self],
uses: &[TypeShapeDslParameterUse],
) -> Option<DslIntegerDomain> {
let [first, rest @ ..] = uses else {
return None;
};
let domain = parameter_domains[first.parameter].integer_domain(first.narrowing)?;
rest.iter()
.all(|use_| {
parameter_domains[use_.parameter].integer_domain(use_.narrowing) == Some(domain)
})
.then_some(domain)
}

/// Whether a value from this domain can be passed to a helper parameter in `expected`.
fn can_forward_to(self, expected: Self) -> bool {
match (self, expected) {
Expand Down Expand Up @@ -1717,6 +1763,25 @@ impl DslStaticKind {
}
}

/// Parameter uses for a bare or narrowed parameter value that can join with a dimension or
/// `Flag[int]` integer expression once parameter annotations are checked.
fn integer_parameter_uses(&self) -> Option<Box<[TypeShapeDslParameterUse]>> {
match self {
Self::UnknownParameters(parameters) => Some(parameter_uses(
parameters,
TypeShapeDslParameterNarrowing::Unnarrowed,
)),
Self::ValueSet { sources, kinds }
if !sources.has_non_parameter_values()
&& kinds & FLAG_NONE == 0
&& kinds & FLAG_INT != 0 =>
{
sources.parameter_uses()
}
_ => None,
}
}

fn join(self, other: Self) -> Option<Self> {
match (self, other) {
(left, right) if left == right => Some(left),
Expand Down Expand Up @@ -3843,8 +3908,12 @@ impl<'a, F: Fn(&Expr) -> Option<TypeShapeDslIntrinsic>> DslValidator<'a, F> {
let args = &call.arguments.args;
let parameter_origins = self.validate_int_tuple_expression(&args[0], flow)?;
let axis = self.slot(&args[1], flow)?;
if let DslStaticKind::DeferredInteger(index) = flow.kinds[axis] {
self.resolve_deferred_integer(index, DslIntegerDomain::Flag)?;
}
let axis_parameters = match &flow.kinds[axis] {
kind if kind.unnarrowed_parameter_origins().is_some() => kind.parameter_uses(),
DslStaticKind::DeferredInteger(_) => None,
DslStaticKind::ValueSet { kinds, .. }
if *kinds & !(FLAG_INT | FLAG_SEQUENCE | FLAG_NONE) == 0 =>
{
Expand Down Expand Up @@ -4119,7 +4188,7 @@ impl<'a, F: Fn(&Expr) -> Option<TypeShapeDslIntrinsic>> DslValidator<'a, F> {
let (when_true, when_false) = self.validate_condition(&if_expr.test, flow)?;
let when_true = self.validate_assignment_value(&if_expr.body, &when_true)?;
let when_false = self.validate_assignment_value(&if_expr.orelse, &when_false)?;
let Some(kind) = when_true.join(when_false) else {
let Some(kind) = self.join_value_kinds(when_true, when_false)? else {
return Err(TypeShapeDslDefinitionError {
range: if_expr.range,
message: "conditional expression branches must have the same value domain",
Expand Down Expand Up @@ -4556,8 +4625,9 @@ impl<'a, F: Fn(&Expr) -> Option<TypeShapeDslIntrinsic>> DslValidator<'a, F> {
DslStaticKind::ValueSet {
sources,
kinds: FLAG_INT,
} if sources.all_prove(TypeShapeDslParameterNarrowing::Integer)
&& sources.non_parameter_values_are(FLAG_INT) =>
} if sources.non_parameter_values_are(FLAG_INT)
&& (sources.all_prove(TypeShapeDslParameterNarrowing::Integer)
|| sources.has_non_parameter_values()) =>
{
Some(DeferredIntegerClassification {
default_domain: DslIntegerDomain::Flag,
Expand All @@ -4566,8 +4636,11 @@ impl<'a, F: Fn(&Expr) -> Option<TypeShapeDslIntrinsic>> DslValidator<'a, F> {
}
DslStaticKind::ValueSet { sources, kinds }
if kinds & FLAG_NONE == 0
&& sources.all_prove(TypeShapeDslParameterNarrowing::NonNone)
&& sources.non_parameter_values_are(FLAG_INT) =>
&& ((sources
.all_prove(TypeShapeDslParameterNarrowing::NonNone)
&& sources.non_parameter_values_are(FLAG_INT))
|| (!sources.has_non_parameter_values()
&& kinds & FLAG_INT != 0)) =>
{
Some(DeferredIntegerClassification {
default_domain: DslIntegerDomain::Dimension,
Expand Down Expand Up @@ -5505,6 +5578,110 @@ impl<'a, F: Fn(&Expr) -> Option<TypeShapeDslIntrinsic>> DslValidator<'a, F> {
Ok(())
}

fn join_value_kinds(
&mut self,
left: DslStaticKind,
right: DslStaticKind,
) -> Result<Option<DslStaticKind>, TypeShapeDslDefinitionError> {
Ok(match (left, right) {
(DslStaticKind::DeferredInteger(left), DslStaticKind::DeferredInteger(right)) => Some(
DslStaticKind::DeferredInteger(self.merge_deferred_integers(left, right)?),
),
(DslStaticKind::DeferredInteger(index), DslStaticKind::Dimension)
| (DslStaticKind::Dimension, DslStaticKind::DeferredInteger(index)) => {
self.resolve_deferred_integer(index, DslIntegerDomain::Dimension)?;
Some(DslStaticKind::Dimension)
}
(DslStaticKind::Dimension, other) | (other, DslStaticKind::Dimension)
if let Some(uses) = other.integer_parameter_uses() =>
{
// Syntax validation runs with `parameter_domains == None` before annotations are
// resolved; revalidation with `Some(domains)` checks that the parameter actually
// belongs to the dimension domain.
self.parameter_domains
.is_none_or(|domains| {
TypeShapeDslInputDomain::shared_integer_domain(domains, &uses)
== Some(DslIntegerDomain::Dimension)
})
.then_some(DslStaticKind::Dimension)
}
(DslStaticKind::DeferredInteger(index), other)
| (other, DslStaticKind::DeferredInteger(index))
if let Some(uses) = other.integer_parameter_uses() =>
{
let kind_for_domain = |domain, uses| match domain {
DslIntegerDomain::Dimension => DslStaticKind::Dimension,
// Retain `parameter_uses` alongside `non_parameter_kinds: FLAG_INT` so the
// merged Flag local stays input-only and cannot be used as a literal dimension.
DslIntegerDomain::Flag => DslStaticKind::ValueSet {
sources: DslValueSources {
parameter_uses: uses,
non_parameter_kinds: FLAG_INT,
},
kinds: FLAG_INT,
},
};
// `previous` is `Some` when an earlier use already locked the deferred integer's
// domain before this branch merge.
let (root, previous) = self.deferred_integer_domain(index);
match self.parameter_domains {
None => Some(match previous {
None => DslStaticKind::DeferredInteger(root),
Some(domain) => kind_for_domain(domain, uses),
}),
Some(domains) => {
match TypeShapeDslInputDomain::shared_integer_domain(domains, &uses) {
Some(domain) if previous.is_none_or(|prev| prev == domain) => {
self.resolve_deferred_integer(index, domain)?;
Some(kind_for_domain(domain, uses))
}
_ => None,
}
}
}
}
(
DslStaticKind::DeferredInteger(index),
flag @ DslStaticKind::ValueSet {
kinds: FLAG_INT, ..
},
)
| (
flag @ DslStaticKind::ValueSet {
kinds: FLAG_INT, ..
},
DslStaticKind::DeferredInteger(index),
) => {
self.resolve_deferred_integer(index, DslIntegerDomain::Flag)?;
Some(flag)
}
(left, right) => {
left.join(right)
.filter(|joined| match (joined, self.parameter_domains) {
// A `ValueSet` cannot mix `Flag` parameters with `Int` / `Int | None` (or
// shape) parameters; rejecting mixed sources here keeps 3+ branch merges
// independent of branch order.
(DslStaticKind::ValueSet { sources, .. }, Some(domains)) => {
let all_flag = sources.parameter_uses.iter().all(|use_| {
matches!(domains[use_.parameter], TypeShapeDslInputDomain::Flag(_))
});
let all_int_like =
sources.non_parameter_kinds & !(FLAG_INT | FLAG_NONE) == 0
&& sources.parameter_uses.iter().all(|use_| {
matches!(
domains[use_.parameter],
TypeShapeDslInputDomain::Value(TypeShapeDslDomain::Int)
| TypeShapeDslInputDomain::OptionalInt
)
});
all_flag || all_int_like
}
_ => true,
})
}
})
}

fn merge_flows(
&mut self,
flows: Vec<DslValidationFlow>,
Expand All @@ -5523,38 +5700,12 @@ impl<'a, F: Fn(&Expr) -> Option<TypeShapeDslIntrinsic>> DslValidator<'a, F> {
if result.assigned[slot] {
let left = result.kinds[slot].clone();
let right = flow.kinds[slot].clone();
let kind = match (left, right) {
(
DslStaticKind::DeferredInteger(left),
DslStaticKind::DeferredInteger(right),
) => DslStaticKind::DeferredInteger(
self.merge_deferred_integers(left, right)?,
),
(DslStaticKind::DeferredInteger(index), DslStaticKind::Dimension)
| (DslStaticKind::Dimension, DslStaticKind::DeferredInteger(index)) => {
self.resolve_deferred_integer(index, DslIntegerDomain::Dimension)?;
DslStaticKind::Dimension
}
(
DslStaticKind::DeferredInteger(index),
flag @ DslStaticKind::ValueSet {
kinds: FLAG_INT, ..
},
)
| (
flag @ DslStaticKind::ValueSet {
kinds: FLAG_INT, ..
},
DslStaticKind::DeferredInteger(index),
) => {
self.resolve_deferred_integer(index, DslIntegerDomain::Flag)?;
flag
}
(left, right) => left.join(right).ok_or(TypeShapeDslDefinitionError {
let kind = self.join_value_kinds(left, right)?.ok_or(
TypeShapeDslDefinitionError {
range,
message: "all continuing branch assignments to a local must have the same value domain",
})?,
};
},
)?;
result.kinds[slot] = kind;
}
}
Expand Down Expand Up @@ -9212,11 +9363,7 @@ mod tests {
};
let int = TypeShapeDslInputDomain::Value(TypeShapeDslDomain::Int);
let optional_int = TypeShapeDslInputDomain::OptionalInt;
let broad_flag = TypeShapeDslInputDomain::Flag(
FlagDomain::of(FlagMember::Int)
.join(FlagDomain::of(FlagMember::IntTuple))
.join(FlagDomain::of(FlagMember::NoneType)),
);
let broad_flag = TypeShapeDslInputDomain::Flag(type_shape_dsl_narrowable_flag_domain());

for actual in [optional_int, broad_flag] {
assert_eq!(
Expand Down
Loading
Loading