mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-08-04 02:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve compiler import

Browse source
This commit is contained in:
Aviv Palivoda 2019-06-14 08:45:30 +03:00
parent a932b729d8
commit 3a1dd34987
1 changed files with 30 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/compile.rs
View file

@ -255,46 +255,45 @@ impl Compiler {
} in import_parts } in import_parts
{ {
if let Some(alias) = alias { if let Some(alias) = alias {
// import module as alias
self.emit(Instruction::Import { self.emit(Instruction::Import {
name: module.clone(), name: module.clone(),
symbols: vec![], symbols: vec![],
}); });
self.store_name(&alias); self.store_name(&alias);
} else if symbols.is_empty() {
// import module
self.emit(Instruction::Import {
name: module.clone(),
symbols: vec![],
});
self.store_name(&module.clone());
} else { } else {
if symbols.is_empty() { let import_star = symbols
.iter()
.any(|import_symbol| import_symbol.symbol == "*");
if import_star {
// from module import *
self.emit(Instruction::ImportStar {
name: module.clone(),
});
} else {
// from module import symbol
// from module import symbol as alias
let (names, symbols_strings): (Vec<String>, Vec<String>) = symbols
.iter()
.map(|ast::ImportSymbol { symbol, alias }| {
(
alias.clone().unwrap_or_else(|| symbol.to_string()),
symbol.to_string(),
)
})
.unzip();
self.emit(Instruction::Import { self.emit(Instruction::Import {
name: module.clone(), name: module.clone(),
symbols: vec![], symbols: symbols_strings,
}); });
self.store_name(&module.clone()); names.iter().rev().for_each(|name| self.store_name(&name));
} else {
let mut import_star = false;
let mut symbols_strings = vec![];
let mut names = vec![];
for ast::ImportSymbol { symbol, alias } in symbols {
if symbol == "*" {
import_star = true;
}
symbols_strings.push(symbol.to_string());
names.insert(
0,
match alias {
Some(alias) => alias,
None => symbol,
},
);
}
if import_star {
self.emit(Instruction::ImportStar {
name: module.clone(),
});
} else {
self.emit(Instruction::Import {
name: module.clone(),
symbols: symbols_strings,
});
names.iter().for_each(|name| self.store_name(&name));
}
} }
} }
} }