mirrors/RustPython-Parser
1
0
Fork 0
mirror of https://github.com/RustPython/Parser.git synced 2025-07-17 18:15:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deduplicate async/normal with compilation code

Browse source
This commit is contained in:
Noah 2019-10-17 11:36:23 -05:00 • committed by coolreader18
parent ae825125a5
commit 19f62b97a3
1 changed files with 32 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/compile.rs
View file

@ -385,12 +385,15 @@ impl<O: OutputStream> Compiler<O> {
items, items,
body, body,
} => { } => {
if *is_async { let is_async = *is_async;
let end_labels = items
.iter() let end_labels = items
.map(|item| { .iter()
let end_label = self.new_label(); .map(|item| {
self.compile_expression(&item.context_expr)?; let end_label = self.new_label();
self.compile_expression(&item.context_expr)?;
if is_async {
self.emit(Instruction::BeforeAsyncWith); self.emit(Instruction::BeforeAsyncWith);
self.emit(Instruction::GetAwaitable); self.emit(Instruction::GetAwaitable);
self.emit(Instruction::LoadConst { self.emit(Instruction::LoadConst {
@ -398,60 +401,39 @@ impl<O: OutputStream> Compiler<O> {
}); });
self.emit(Instruction::YieldFrom); self.emit(Instruction::YieldFrom);
self.emit(Instruction::SetupAsyncWith { end: end_label }); self.emit(Instruction::SetupAsyncWith { end: end_label });
match &item.optional_vars { } else {
Some(var) => { self.emit(Instruction::SetupWith { end: end_label });
self.compile_store(var)?; }
}
None => { match &item.optional_vars {
self.emit(Instruction::Pop); Some(var) => {
} self.compile_store(var)?;
} }
Ok(end_label) None => {
}) self.emit(Instruction::Pop);
.collect::<Result<Vec<_>, CompileError>>()?; }
}
Ok(end_label)
})
.collect::<Result<Vec<_>, CompileError>>()?;
self.compile_statements(body)?; self.compile_statements(body)?;
for end_label in end_labels { for end_label in end_labels {
self.emit(Instruction::PopBlock); self.emit(Instruction::PopBlock);
self.emit(Instruction::EnterFinally); self.emit(Instruction::EnterFinally);
self.set_label(end_label); self.set_label(end_label);
self.emit(Instruction::WithCleanupStart); self.emit(Instruction::WithCleanupStart);
if is_async {
self.emit(Instruction::GetAwaitable); self.emit(Instruction::GetAwaitable);
self.emit(Instruction::LoadConst { self.emit(Instruction::LoadConst {
value: bytecode::Constant::None, value: bytecode::Constant::None,
}); });
self.emit(Instruction::YieldFrom); self.emit(Instruction::YieldFrom);
self.emit(Instruction::WithCleanupFinish);
} }
} else {
let end_labels = items
.iter()
.map(|item| {
let end_label = self.new_label();
self.compile_expression(&item.context_expr)?;
self.emit(Instruction::SetupWith { end: end_label });
match &item.optional_vars {
Some(var) => {
self.compile_store(var)?;
}
None => {
self.emit(Instruction::Pop);
}
}
Ok(end_label)
})
.collect::<Result<Vec<_>, CompileError>>()?;
self.compile_statements(body)?; self.emit(Instruction::WithCleanupFinish);
for end_label in end_labels {
self.emit(Instruction::PopBlock);
self.emit(Instruction::EnterFinally);
self.set_label(end_label);
self.emit(Instruction::WithCleanupStart);
self.emit(Instruction::WithCleanupFinish);
}
} }
} }
For { For {