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

Revert "Simplify compile_dict"

Browse source 
This reverts commit b31b08a30eb24e246b7f0a0d69b2b5e56a7e7a40.
This commit is contained in:
harupy 2023-01-16 01:27:54 +09:00
parent 4f32bacf9c
commit d83e3ee8cd
1 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

26
codegen/src/compile.rs
View file

@ -1991,17 +1991,23 @@ impl Compiler {
keys: &[Option<ast::Expr>],
values: &[ast::Expr],
) -> CompileResult<()> {
emit!(self, Instruction::BuildMap { size: 0 });
for (key, value) in keys.iter().zip(values.iter()) {
if let Some(key) = key {
self.compile_expression(key)?;
self.compile_expression(value)?;
emit!(self, Instruction::MapAdd { i: 0 });
} else {
self.compile_expression(value)?;
emit!(self, Instruction::DictUpdate);
}
let mut size = 0;
let (packed, unpacked): (Vec<_>, Vec<_>) = keys
.iter()
.zip(values.iter())
.partition(|(k, _)| k.is_some());
for (key, value) in packed {
self.compile_expression(key.as_ref().unwrap())?;
self.compile_expression(value)?;
size += 1;
}
emit!(self, Instruction::BuildMap { size });
for (_, value) in unpacked {
self.compile_expression(value)?;
emit!(self, Instruction::DictUpdate);
}
Ok(())
}