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

Refactor block stack unwinding to enable finally execution.

Browse source
This commit is contained in:
Windel Bouwman 2019-08-27 19:40:00 +02:00
parent 39c095d12c
commit e8db01a09a
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/compile.rs
View file

@ -708,12 +708,20 @@ impl<O: OutputStream> Compiler<O> {
&mut self, &mut self,
body: &[ast::Statement], body: &[ast::Statement],
handlers: &[ast::ExceptHandler], handlers: &[ast::ExceptHandler],
orelse: &Option<Vec<ast::Statement>>, orelse: &Option<ast::Suite>,
finalbody: &Option<Vec<ast::Statement>>, finalbody: &Option<ast::Suite>,
) -> Result<(), CompileError> { ) -> Result<(), CompileError> {
let mut handler_label = self.new_label(); let mut handler_label = self.new_label();
let finally_label = self.new_label(); let finally_label = self.new_label();
let else_label = self.new_label(); let else_label = self.new_label();
// Setup a finally block if we have a finally statement.
if finalbody.is_some() {
self.emit(Instruction::SetupFinally {
handler: finally_label,
});
}
// try: // try:
self.emit(Instruction::SetupExcept { self.emit(Instruction::SetupExcept {
handler: handler_label, handler: handler_label,
@ -798,8 +806,9 @@ impl<O: OutputStream> Compiler<O> {
self.set_label(finally_label); self.set_label(finally_label);
if let Some(statements) = finalbody { if let Some(statements) = finalbody {
self.compile_statements(statements)?; self.compile_statements(statements)?;
self.emit(Instruction::EndFinally);
} }
// unimplemented!();
Ok(()) Ok(())
} }