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

compile_with as recursive form

Browse source
This commit is contained in:
Jeong YunWon 2022-08-11 03:39:50 +09:00
parent a9306971ae
commit fa6c66272e
2 changed files with 56 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/compile.rs
View file

@ -1395,10 +1395,14 @@ impl Compiler {
) -> CompileResult<()> {
let with_location = self.current_source_location;
let end_blocks = items
.iter()
.map(|item| {
let end_block = self.new_block();
let (item, items) = if let Some(parts) = items.split_first() {
parts
} else {
return Err(self.error(CompileErrorType::EmptyWithItems));
};
let final_block = {
let final_block = self.new_block();
self.compile_expression(&item.context_expr)?;
self.set_source_location(with_location);
@ -1407,9 +1411,9 @@ impl Compiler {
self.emit(Instruction::GetAwaitable);
self.emit_constant(ConstantData::None);
self.emit(Instruction::YieldFrom);
self.emit(Instruction::SetupAsyncWith { end: end_block });
self.emit(Instruction::SetupAsyncWith { end: final_block });
} else {
self.emit(Instruction::SetupWith { end: end_block });
self.emit(Instruction::SetupWith { end: final_block });
}
match &item.optional_vars {
@ -1421,20 +1425,27 @@ impl Compiler {
self.emit(Instruction::Pop);
}
}
Ok(end_block)
})
.collect::<CompileResult<Vec<_>>>()?;
final_block
};
if items.is_empty() {
if body.is_empty() {
return Err(self.error(CompileErrorType::EmptyWithBody));
}
self.compile_statements(body)?;
} else {
self.set_source_location(with_location);
self.compile_with(items, body, is_async)?;
}
// sort of "stack up" the layers of with blocks:
// with a, b: body -> start_with(a) start_with(b) body() end_with(b) end_with(a)
self.set_source_location(with_location);
for end_block in end_blocks.into_iter().rev() {
self.emit(Instruction::PopBlock);
self.emit(Instruction::EnterFinally);
self.switch_to_block(end_block);
self.switch_to_block(final_block);
self.emit(Instruction::WithCleanupStart);
if is_async {
@ -1444,7 +1455,6 @@ impl Compiler {
}
self.emit(Instruction::WithCleanupFinish);
}
Ok(())
}

8
src/error.rs
View file

@ -35,6 +35,8 @@ pub enum CompileErrorType {
InvalidFutureFeature(String),
FunctionImportStar,
TooManyStarUnpack,
EmptyWithItems,
EmptyWithBody,
}
impl fmt::Display for CompileErrorType {
@ -70,6 +72,12 @@ impl fmt::Display for CompileErrorType {
CompileErrorType::TooManyStarUnpack => {
write!(f, "too many expressions in star-unpacking assignment")
}
CompileErrorType::EmptyWithItems => {
write!(f, "empty items on With")
}
CompileErrorType::EmptyWithBody => {
write!(f, "empty body on With")
}
}
}
}