mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-24 13:34:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix weirdness with import submodules

Browse source
This commit is contained in:
coolreader18 2019-08-13 21:28:09 -05:00
parent 48005efef3
commit 7aac5b634f
2 changed files with 43 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/compile.rs
View file

@ -300,16 +300,11 @@ impl<O: OutputStream> Compiler<O> {
Import { names } => {
// import a, b, c as d
for name in names {
self.emit(Instruction::Import {
name: Some(name.symbol.clone()),
symbols: vec![],
level: 0,
});
self.compile_import(Some(&name.symbol), vec![], 0, name.alias.is_some());
if let Some(alias) = &name.alias {
self.store_name(alias);
} else {
self.store_name(&name.symbol);
self.store_name(name.symbol.split('.').next().unwrap());
}
}
}
@ -322,21 +317,25 @@ impl<O: OutputStream> Compiler<O> {
if import_star {
// from .... import *
self.emit(Instruction::ImportStar {
name: module.clone(),
level: *level,
});
self.compile_import(
module.as_ref().map(String::as_str),
vec!["*".to_owned()],
*level,
false,
);
self.emit(Instruction::ImportStar);
} else {
// from mod import a, b as c
// First, determine the fromlist (for import lib):
let from_list = names.iter().map(|n| n.symbol.clone()).collect();
// Load module once:
self.emit(Instruction::Import {
name: module.clone(),
symbols: from_list,
level: *level,
});
self.compile_import(
module.as_ref().map(String::as_str),
from_list,
*level,
false,
);
for name in names {
// import symbol from module:
@ -574,6 +573,30 @@ impl<O: OutputStream> Compiler<O> {
Ok(())
}
fn compile_import(
&mut self,
name: Option<&str>,
symbols: Vec<String>,
level: usize,
get_final_module: bool,
) {
self.emit(Instruction::Import {
name: name.map(ToOwned::to_owned),
symbols,
level,
});
if get_final_module {
if let Some(name) = name {
for part in name.split('.').skip(1) {
self.emit(Instruction::LoadAttr {
name: part.to_owned(),
});
}
}
}
}
fn compile_delete(&mut self, expression: &ast::Expression) -> Result<(), CompileError> {
match &expression.node {
ast::ExpressionType::Identifier { name } => {

5
src/symboltable.rs
View file

@ -388,7 +388,10 @@ impl SymbolTableBuilder {
self.register_name(alias, SymbolUsage::Assigned)?;
} else {
// `import module`
self.register_name(&name.symbol, SymbolUsage::Assigned)?;
self.register_name(
name.symbol.split('.').next().unwrap(),
SymbolUsage::Assigned,
)?;
}
}
}