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
1 change: 1 addition & 0 deletions pyrefly/lib/alt/narrow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1678,6 +1678,7 @@ impl<'ctx, 'answer, Ans: LookupAnswer> AnswersSolver<'ctx, 'answer, Ans> {
);
self.intersect_with_fallback(ty, &element, IntersectFallback::Right)
}
AtomicNarrowOp::WalrusValue(value) => self.get_idx(*value).ty().clone(),
AtomicNarrowOp::ClassCoverageGate(_) => ty.clone(),
AtomicNarrowOp::ClassCoverageGateNeg(keys) => {
// Subtract the class only when every positional slot's sub-pattern exhausts its
Expand Down
37 changes: 37 additions & 0 deletions pyrefly/lib/binding/narrow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/

use std::fmt;
use std::mem;

use pyrefly_graph::index::Idx;
use pyrefly_python::ast::Ast;
Expand Down Expand Up @@ -109,6 +110,12 @@ pub enum AtomicNarrowOp {
/// `MatchSubjectElement($S, 1)` narrows the original `b` to that case's `$S[1]` type.
/// The binding index identifies the narrowed `$S` for the current case.
MatchSubjectElement(Idx<Key>, usize),
/// The subject was just assigned by a walrus, and the key is that assignment's binding;
/// narrows the subject to the assigned type. A walrus in a later operand of a boolean
/// operation only runs when the earlier operands pass, so the flow merge after the
/// operation widens the name again. In a position where the whole test is known to have
/// passed, such as the body of `if u and (u := str(u)):`, this restores the assigned type.
WalrusValue(Idx<Key>),
/// Narrowing for sequence pattern matching - confirms the subject is a sequence type
IsSequence,
/// Negation of IsSequence - confirms the subject is NOT a sequence type
Expand Down Expand Up @@ -167,6 +174,7 @@ impl NarrowOp {
| AtomicNarrowOp::IsTruthy
| AtomicNarrowOp::IsFalsy
| AtomicNarrowOp::MatchSubjectElement(_, _)
| AtomicNarrowOp::WalrusValue(_)
| AtomicNarrowOp::Placeholder
),
Self::And(ops) | Self::Or(ops) => ops.iter().all(Self::is_plain_root),
Expand Down Expand Up @@ -253,6 +261,7 @@ impl DisplayWith<ModuleInfo> for AtomicNarrowOp {
AtomicNarrowOp::MatchSubjectElement(subject, index) => {
write!(f, "MatchSubjectElement({subject:?}, {index})")
}
AtomicNarrowOp::WalrusValue(value) => write!(f, "WalrusValue({value:?})"),
AtomicNarrowOp::IsNotSequence => write!(f, "IsNotSequence"),
AtomicNarrowOp::IsMapping => write!(f, "IsMapping"),
AtomicNarrowOp::IsNotMapping => write!(f, "IsNotMapping"),
Expand Down Expand Up @@ -401,6 +410,7 @@ impl AtomicNarrowOp {
)),
Self::Placeholder => None,
Self::MatchSubjectElement(_, _) => None,
Self::WalrusValue(_) => None,
Self::ClassCoverageGate(_) | Self::ClassCoverageGateNeg(_) => None,
}
}
Expand Down Expand Up @@ -449,6 +459,8 @@ impl AtomicNarrowOp {
Self::Placeholder => Self::Placeholder,
// Element projections apply only within the current case.
Self::MatchSubjectElement(_, _) => Self::Placeholder,
// Whether the test passed or failed, an evaluated walrus has assigned its value.
Self::WalrusValue(value) => Self::WalrusValue(*value),
Self::ClassCoverageGate(ks) => Self::ClassCoverageGateNeg(ks.clone()),
Self::ClassCoverageGateNeg(ks) => Self::ClassCoverageGate(ks.clone()),
}
Expand Down Expand Up @@ -572,6 +584,16 @@ impl NarrowOp {
pub fn negate(&self) -> Self {
match self {
Self::Atomic(attr, op) => Self::Atomic(attr.clone(), op.negate()),
// A walrus assigns its value whether or not the test passes, so that fact stays
// in front of the negation; only the conditions on the value are negated.
Self::And(ops)
if let [
fact @ Self::Atomic(None, AtomicNarrowOp::WalrusValue(_)),
conditions @ ..,
] = ops.as_slice() =>
{
Self::And(vec![fact.clone(), Self::And(conditions.to_vec()).negate()])
}
Self::And(ops) => Self::Or(ops.map(|op| op.negate())),
Self::Or(ops) => Self::And(ops.map(|op| op.negate())),
}
Expand Down Expand Up @@ -1346,6 +1368,21 @@ impl NarrowOps {
AtomicNarrowOp::IsTruthy,
named.target.range(),
);
// Where this test is known to have passed, the target holds the assigned value,
// even if the walrus sits in a later operand of a boolean operation and the
// flow after the operation merges it with the earlier value of the name.
if let Expr::Name(name) = &*named.target
&& let Some(value) =
builder.promised_idx(&Key::Definition(ShortIdentifier::expr_name(name)))
{
for (op, _) in target_narrow.0.values_mut() {
let is_truthy = mem::replace(
op,
NarrowOp::Atomic(None, AtomicNarrowOp::WalrusValue(value)),
);
op.and(is_truthy);
}
}
let value_narrow =
Self::from_expr_helper(builder, Some(*named.value.clone()).as_ref(), seen);
// Merge the entries from the two `NarrowOps`
Expand Down
40 changes: 40 additions & 0 deletions pyrefly/lib/test/flow_branching.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2673,6 +2673,46 @@ def f_or():
"#,
);

testcase!(
test_walrus_in_later_bool_op_operand_narrows,
r#"
import os
from typing import assert_type

def f(u: str | os.PathLike[str]) -> None:
if u and (u := str(u)):
assert_type(u, str)
assert_type(u, str | os.PathLike[str])

def g(u: str | os.PathLike[str], flag: bool) -> None:
if flag and (u := str(u)):
assert_type(u, str)
else:
assert_type(u, str | os.PathLike[str])

def h(u: str | os.PathLike[str]) -> None:
if not u or not (u := str(u)):
return
assert_type(u, str)

def k(u: str | os.PathLike[str]) -> None:
while u and (u := str(u)):
assert_type(u, str)
break

def m(u: str | os.PathLike[str]) -> str:
return u if u and (u := str(u)) else ""

def n(u: str | os.PathLike[str]) -> None:
x = u and (u := str(u))
assert_type(u, str | os.PathLike[str])

def p(u: str | os.PathLike[str]) -> None:
if u and (u := str(u)) and u.upper():
assert_type(u, str)
"#,
);

testcase!(
test_setitem_with_loop_and_walrus,
r#"
Expand Down
Loading