language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-30 13:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

red-knot: flatten match expression in infer_binary_expression (#13115)

Browse source 
## Summary

This fixes the outstanding TODO and make it easier to work with new
cases. (Tidy first, *then* implement, basically!)

## Test Plan

After making this change all the existing tests still pass. A classic
refactor win. 🎉
This commit is contained in:
Chris Krycho 2024-08-26 13:34:07 -06:00 • committed by GitHub
parent fe8b15291f
commit 390bb43276
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 44 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

108
crates/red_knot_python_semantic/src/types/infer.rs
View file

@ -1729,72 +1729,52 @@ impl<'db> TypeInferenceBuilder<'db> {
let left_ty = self.infer_expression(left); let left_ty = self.infer_expression(left);
let right_ty = self.infer_expression(right); let right_ty = self.infer_expression(right);
// TODO flatten the matches by matching on (left_ty, right_ty, op) match (left_ty, right_ty, op) {
match left_ty { (Type::Any, _, _) | (_, Type::Any, _) => Type::Any,
Type::Any => Type::Any, (Type::Unknown, _, _) | (_, Type::Unknown, _) => Type::Unknown,
Type::Unknown => Type::Unknown,
Type::IntLiteral(n) => { (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Add) => n
match right_ty { .checked_add(m)
Type::IntLiteral(m) => { .map(Type::IntLiteral)
match op { .unwrap_or_else(|| builtins_symbol_ty_by_name(self.db, "int").instance()),
ast::Operator::Add => {
n.checked_add(m).map(Type::IntLiteral).unwrap_or_else(|| { (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Sub) => n
builtins_symbol_ty_by_name(self.db, "int").instance() .checked_sub(m)
}) .map(Type::IntLiteral)
} .unwrap_or_else(|| builtins_symbol_ty_by_name(self.db, "int").instance()),
ast::Operator::Sub => {
n.checked_sub(m).map(Type::IntLiteral).unwrap_or_else(|| { (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Mult) => n
builtins_symbol_ty_by_name(self.db, "int").instance() .checked_mul(m)
}) .map(Type::IntLiteral)
} .unwrap_or_else(|| builtins_symbol_ty_by_name(self.db, "int").instance()),
ast::Operator::Mult => {
n.checked_mul(m).map(Type::IntLiteral).unwrap_or_else(|| { (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Div) => n
builtins_symbol_ty_by_name(self.db, "int").instance() .checked_div(m)
}) .map(Type::IntLiteral)
} .unwrap_or_else(|| builtins_symbol_ty_by_name(self.db, "int").instance()),
ast::Operator::Div => {
n.checked_div(m).map(Type::IntLiteral).unwrap_or_else(|| { (Type::IntLiteral(n), Type::IntLiteral(m), ast::Operator::Mod) => n
builtins_symbol_ty_by_name(self.db, "int").instance() .checked_rem(m)
}) .map(Type::IntLiteral)
} // TODO division by zero error
ast::Operator::Mod => n .unwrap_or(Type::Unknown),
.checked_rem(m)
.map(Type::IntLiteral) (Type::BytesLiteral(lhs), Type::BytesLiteral(rhs), ast::Operator::Add) => {
// TODO division by zero error Type::BytesLiteral(BytesLiteralType::new(
.unwrap_or(Type::Unknown), self.db,
_ => Type::Unknown, // TODO [lhs.value(self.db).as_ref(), rhs.value(self.db).as_ref()]
} .concat()
} .into_boxed_slice(),
_ => Type::Unknown, // TODO ))
}
} }
Type::BytesLiteral(lhs) => {
match right_ty { (Type::StringLiteral(lhs), Type::StringLiteral(rhs), ast::Operator::Add) => {
Type::BytesLiteral(rhs) => { Type::StringLiteral(StringLiteralType::new(self.db, {
match op { let lhs_value = lhs.value(self.db);
ast::Operator::Add => Type::BytesLiteral(BytesLiteralType::new( let rhs_value = rhs.value(self.db);
self.db, lhs_value.clone() + rhs_value
[lhs.value(self.db).as_ref(), rhs.value(self.db).as_ref()] }))
.concat()
.into_boxed_slice(),
)),
_ => Type::Unknown, // TODO
}
}
_ => Type::Unknown, // TODO
}
} }
Type::StringLiteral(lhs) => match right_ty {
Type::StringLiteral(rhs) => match op {
ast::Operator::Add => Type::StringLiteral(StringLiteralType::new(self.db, {
let lhs_value = lhs.value(self.db);
let rhs_value = rhs.value(self.db);
lhs_value.clone() + rhs_value
})),
_ => Type::Unknown, // TODO
},
_ => Type::Unknown, // TODO
},
_ => Type::Unknown, // TODO _ => Type::Unknown, // TODO
} }
} }