Skip to content

Async for comprehension #5276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 6 commits into from
Apr 25, 2024
Merged

Async for comprehension #5276

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2856aff
Begin async list comprehension implementation
aaronclong Mar 6, 2021
61f37b1
implement async for function in compiler
HyeockJinKim Aug 25, 2021
f3501f4
Basic async for comprehension support
youknowone Apr 25, 2024
b58bdc9
Uncomment async for tests
youknowone Apr 25, 2024
f6d8804
Uncomment test_grammar tests
youknowone Apr 25, 2024
408459b
vm runtime debug prints
youknowone Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
vm runtime debug prints
  • Loading branch information
@youknowone
youknowone committed Apr 25, 2024
commit 408459b8833b800cdf82fb35ccd01a299b610006
32 changes: 30 additions & 2 deletions vm/src/frame.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,10 @@ impl ExecutingFrame<'_> {
let mut arg_state = bytecode::OpArgState::default();
loop {
let idx = self.lasti() as usize;
// eprintln!(
// "location: {:?} {}",
// self.code.locations[idx], self.code.source_path
// );
self.update_lasti(|i| *i += 1);
let bytecode::CodeUnit { op, arg } = instrs[idx];
let arg = arg_state.extend(arg);
Expand Down Expand Up @@ -993,6 +997,9 @@ impl ExecutingFrame<'_> {
Ok(None)
}
bytecode::Instruction::GetANext => {
#[cfg(debug_assertions)] // remove when GetANext is fully implemented
let orig_stack_len = self.state.stack.len();

let aiter = self.top_value();
let awaitable = if aiter.class().is(vm.ctx.types.async_generator) {
vm.call_special_method(aiter, identifier!(vm, __anext__), ())?
Expand Down Expand Up @@ -1030,6 +1037,8 @@ impl ExecutingFrame<'_> {
})?
};
self.push_value(awaitable);
#[cfg(debug_assertions)]
debug_assert_eq!(orig_stack_len + 1, self.state.stack.len());
Ok(None)
}
bytecode::Instruction::EndAsyncFor => {
Expand Down Expand Up @@ -1238,6 +1247,7 @@ impl ExecutingFrame<'_> {
fn unwind_blocks(&mut self, vm: &VirtualMachine, reason: UnwindReason) -> FrameResult {
// First unwind all existing blocks on the block stack:
while let Some(block) = self.current_block() {
// eprintln!("unwinding block: {:.60?} {:.60?}", block.typ, reason);
match block.typ {
BlockType::Loop => match reason {
UnwindReason::Break { target } => {
Expand Down Expand Up @@ -1935,6 +1945,7 @@ impl ExecutingFrame<'_> {
}

fn push_block(&mut self, typ: BlockType) {
// eprintln!("block pushed: {:.60?} {}", typ, self.state.stack.len());
self.state.blocks.push(Block {
typ,
level: self.state.stack.len(),
Expand All @@ -1944,7 +1955,12 @@ impl ExecutingFrame<'_> {
#[track_caller]
fn pop_block(&mut self) -> Block {
let block = self.state.blocks.pop().expect("No more blocks to pop!");
// eprintln!("popped block: {:?} stack: {} truncate to {}", block.typ, self.state.stack.len(), block.level);
// eprintln!(
// "block popped: {:.60?} {} -> {} ",
// block.typ,
// self.state.stack.len(),
// block.level
// );
#[cfg(debug_assertions)]
if self.state.stack.len() < block.level {
dbg!(&self);
Expand All @@ -1966,6 +1982,11 @@ impl ExecutingFrame<'_> {
#[inline]
#[track_caller] // not a real track_caller but push_value is not very useful
fn push_value(&mut self, obj: PyObjectRef) {
// eprintln!(
// "push_value {} / len: {} +1",
// obj.class().name(),
// self.state.stack.len()
// );
match self.state.stack.try_push(obj) {
Ok(()) => {}
Err(_e) => self.fatal("tried to push value onto stack but overflowed max_stackdepth"),
Expand All @@ -1976,7 +1997,14 @@ impl ExecutingFrame<'_> {
#[track_caller] // not a real track_caller but pop_value is not very useful
fn pop_value(&mut self) -> PyObjectRef {
match self.state.stack.pop() {
Some(x) => x,
Some(x) => {
// eprintln!(
// "pop_value {} / len: {}",
// x.class().name(),
// self.state.stack.len()
// );
x
}
None => self.fatal("tried to pop value but there was nothing on the stack"),
}
}
Expand Down