Cyclic0007/ruff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try boxing

Browse Source
This commit is contained in:
Charlie Marsh
2023-05-06 23:39:06 -04:00
parent cd5c69b61c
commit da8481c97d
7 changed files with 188 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
crates/ruff_python_semantic/src/binding.rs
View File

@@ -59,45 +59,28 @@ impl<'a> Binding<'a> {
pub fn redefines(&self, existing: &'a Binding) -> bool {
match &self.kind {
BindingKind::Importation(Importation { full_name, .. }) => {
if let BindingKind::SubmoduleImportation(SubmoduleImportation {
full_name: existing,
..
}) = &existing.kind
{
return full_name == existing;
BindingKind::Importation(import) => {
if let BindingKind::SubmoduleImportation(existing) = &existing.kind {
return import.full_name == existing.full_name;
}
}
BindingKind::FromImportation(FromImportation { full_name, .. }) => {
if let BindingKind::SubmoduleImportation(SubmoduleImportation {
full_name: existing,
..
}) = &existing.kind
{
return full_name == existing;
BindingKind::FromImportation(import) => {
if let BindingKind::SubmoduleImportation(existing) = &existing.kind {
return import.full_name == existing.full_name;
}
}
BindingKind::SubmoduleImportation(SubmoduleImportation { full_name, .. }) => {
match &existing.kind {
BindingKind::Importation(Importation {
full_name: existing,
..
})
| BindingKind::SubmoduleImportation(SubmoduleImportation {
full_name: existing,
..
}) => {
return full_name == existing;
}
BindingKind::FromImportation(FromImportation {
full_name: existing,
..
}) => {
return full_name == existing;
}
_ => {}
BindingKind::SubmoduleImportation(import) => match &existing.kind {
BindingKind::Importation(existing) => {
return import.full_name == existing.full_name;
}
}
BindingKind::SubmoduleImportation(existing) => {
return import.full_name == existing.full_name;
}
BindingKind::FromImportation(existing) => {
return import.full_name == existing.full_name;
}
_ => {}
},
BindingKind::Annotation => {
return false;
}
@@ -259,11 +242,11 @@ pub enum BindingKind<'a> {
Builtin,
ClassDefinition,
FunctionDefinition,
Export(Export<'a>),
Export(Box<Export<'a>>),
FutureImportation,
Importation(Importation<'a>),
FromImportation(FromImportation<'a>),
SubmoduleImportation(SubmoduleImportation<'a>),
Importation(Box<Importation<'a>>),
FromImportation(Box<FromImportation<'a>>),
SubmoduleImportation(Box<SubmoduleImportation<'a>>),
}
bitflags! {

66
crates/ruff_python_semantic/src/context.rs
View File

@@ -166,10 +166,8 @@ impl<'a> Context<'a> {
return None;
};
match &binding.kind {
BindingKind::Importation(Importation {
full_name: name, ..
})
| BindingKind::SubmoduleImportation(SubmoduleImportation { name, .. }) => {
BindingKind::Importation(import) => {
let name = import.full_name;
if name.starts_with('.') {
if let Some(module) = &self.module_path {
let mut source_path = from_relative_import(module, name);
@@ -188,9 +186,28 @@ impl<'a> Context<'a> {
Some(source_path)
}
}
BindingKind::FromImportation(FromImportation {
full_name: name, ..
}) => {
BindingKind::SubmoduleImportation(import) => {
let name = import.name;
if name.starts_with('.') {
if let Some(module) = &self.module_path {
let mut source_path = from_relative_import(module, name);
if source_path.is_empty() {
None
} else {
source_path.extend(call_path.into_iter().skip(1));
Some(source_path)
}
} else {
None
}
} else {
let mut source_path: CallPath = from_unqualified_name(name);
source_path.extend(call_path.into_iter().skip(1));
Some(source_path)
}
}
BindingKind::FromImportation(import) => {
let name = &import.full_name;
if name.starts_with('.') {
if let Some(module) = &self.module_path {
let mut source_path = from_relative_import(module, name);
@@ -243,16 +260,19 @@ impl<'a> Context<'a> {
// Ex) Given `module="sys"` and `object="exit"`:
// `import sys` -> `sys.exit`
// `import sys as sys2` -> `sys2.exit`
BindingKind::Importation(Importation { name, full_name }) => {
if full_name == &module {
BindingKind::Importation(import) => {
if import.full_name == module {
// Verify that `sys` isn't bound in an inner scope.
if self
.scopes()
.take(scope_index)
.all(|scope| scope.get(name).is_none())
.all(|scope| scope.get(import.name).is_none())
{
if let Some(source) = binding.source {
return Some((self.stmts[source], format!("{name}.{member}")));
return Some((
self.stmts[source],
format!("{}.{member}", import.name),
));
}
}
}
@@ -260,17 +280,22 @@ impl<'a> Context<'a> {
// Ex) Given `module="os.path"` and `object="join"`:
// `from os.path import join` -> `join`
// `from os.path import join as join2` -> `join2`
BindingKind::FromImportation(FromImportation { name, full_name }) => {
if let Some((target_module, target_member)) = full_name.split_once('.') {
BindingKind::FromImportation(import) => {
if let Some((target_module, target_member)) =
import.full_name.split_once('.')
{
if target_module == module && target_member == member {
// Verify that `join` isn't bound in an inner scope.
if self
.scopes()
.take(scope_index)
.all(|scope| scope.get(name).is_none())
.all(|scope| scope.get(import.name).is_none())
{
if let Some(source) = binding.source {
return Some((self.stmts[source], (*name).to_string()));
return Some((
self.stmts[source],
(*import.name).to_string(),
));
}
}
}
@@ -278,16 +303,19 @@ impl<'a> Context<'a> {
}
// Ex) Given `module="os"` and `object="name"`:
// `import os.path ` -> `os.name`
BindingKind::SubmoduleImportation(SubmoduleImportation { name, .. }) => {
if name == &module {
BindingKind::SubmoduleImportation(import) => {
if import.name == module {
// Verify that `os` isn't bound in an inner scope.
if self
.scopes()
.take(scope_index)
.all(|scope| scope.get(name).is_none())
.all(|scope| scope.get(import.name).is_none())
{
if let Some(source) = binding.source {
return Some((self.stmts[source], format!("{name}.{member}")));
return Some((
self.stmts[source],
format!("{}.{member}", import.name),
));
}
}
}