1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
use std::collections::BTreeMap;
use std::rc::Rc;
use crate::value::{VmError, VmValue};
impl super::super::Vm {
pub(super) fn execute_iter_init(&mut self) -> Result<(), VmError> {
let iterable = self.pop()?;
match iterable {
VmValue::List(items) => {
self.iterators
.push(super::super::IterState::Vec { items, idx: 0 });
}
VmValue::Dict(map) => {
let keys = map.keys().cloned().collect();
self.iterators.push(super::super::IterState::Dict {
entries: map,
keys,
idx: 0,
});
}
VmValue::Set(items) => {
self.iterators
.push(super::super::IterState::Vec { items, idx: 0 });
}
VmValue::Channel(ch) => {
self.iterators.push(super::super::IterState::Channel {
receiver: ch.receiver.clone(),
closed: ch.closed.clone(),
});
}
VmValue::Generator(gen) => {
self.iterators
.push(super::super::IterState::Generator { gen });
}
VmValue::Stream(stream) => {
self.iterators
.push(super::super::IterState::Stream { stream });
}
VmValue::Range(r) => {
let stop = if r.inclusive {
// Saturate to avoid i64 overflow on `i64::MAX to i64::MAX`.
r.end.saturating_add(1)
} else {
r.end
};
// `5 to 1` is simply empty: no reverse iteration.
let next = r.start;
self.iterators
.push(super::super::IterState::Range { next, stop });
}
VmValue::Iter(handle) => {
self.iterators
.push(super::super::IterState::VmIter { handle });
}
_ => {
self.iterators.push(super::super::IterState::Vec {
items: Rc::new(Vec::new()),
idx: 0,
});
}
}
Ok(())
}
pub(super) async fn execute_iter_next(&mut self) -> Result<(), VmError> {
let frame = self.frames.last_mut().unwrap();
let target = frame.chunk.read_u16(frame.ip) as usize;
frame.ip += 2;
// Clone the handle so we don't hold a borrow on self.iterators across
// the async next() call.
let vm_iter_handle = match self.iterators.last() {
Some(super::super::IterState::VmIter { handle }) => Some(handle.clone()),
_ => None,
};
if let Some(handle) = vm_iter_handle {
// Safe for recursive VM reentry via closures as long as they don't
// re-enter the same iter handle.
let next_val = crate::vm::iter::next_handle(&handle, self).await?;
match next_val {
Some(v) => self.stack.push(v),
None => {
self.iterators.pop();
let frame = self.frames.last_mut().unwrap();
frame.ip = target;
}
}
} else if let Some(state) = self.iterators.last_mut() {
match state {
super::super::IterState::Vec { items, idx } => {
if *idx < items.len() {
let item = items[*idx].clone();
*idx += 1;
self.stack.push(item);
} else {
self.iterators.pop();
let frame = self.frames.last_mut().unwrap();
frame.ip = target;
}
}
super::super::IterState::Dict { entries, keys, idx } => {
if *idx < keys.len() {
let key = &keys[*idx];
let value = entries.get(key).cloned().unwrap_or(VmValue::Nil);
*idx += 1;
self.stack.push(VmValue::Dict(Rc::new(BTreeMap::from([
("key".to_string(), VmValue::String(Rc::from(key.as_str()))),
("value".to_string(), value),
]))));
} else {
self.iterators.pop();
let frame = self.frames.last_mut().unwrap();
frame.ip = target;
}
}
super::super::IterState::Channel { receiver, closed } => {
let rx = receiver.clone();
let is_closed = closed.load(std::sync::atomic::Ordering::Relaxed);
let mut guard = rx.lock().await;
// Closed sender: drain without blocking.
let item = if is_closed {
guard.try_recv().ok()
} else {
guard.recv().await
};
match item {
Some(val) => {
self.stack.push(val);
}
None => {
drop(guard);
self.iterators.pop();
let frame = self.frames.last_mut().unwrap();
frame.ip = target;
}
}
}
super::super::IterState::Range { next, stop } => {
if *next < *stop {
let v = *next;
*next += 1;
self.stack.push(VmValue::Int(v));
} else {
self.iterators.pop();
let frame = self.frames.last_mut().unwrap();
frame.ip = target;
}
}
super::super::IterState::Generator { gen } => {
if gen.done.get() {
self.iterators.pop();
let frame = self.frames.last_mut().unwrap();
frame.ip = target;
} else {
let rx = gen.receiver.clone();
let mut guard = rx.lock().await;
match guard.recv().await {
Some(Ok(val)) => {
self.stack.push(val);
}
Some(Err(error)) => {
gen.done.set(true);
drop(guard);
self.iterators.pop();
return Err(error);
}
None => {
gen.done.set(true);
drop(guard);
self.iterators.pop();
let frame = self.frames.last_mut().unwrap();
frame.ip = target;
}
}
}
}
super::super::IterState::Stream { stream } => {
if stream.done.get() {
self.iterators.pop();
let frame = self.frames.last_mut().unwrap();
frame.ip = target;
} else {
let rx = stream.receiver.clone();
let mut guard = rx.lock().await;
match guard.recv().await {
Some(Ok(val)) => {
self.stack.push(val);
}
Some(Err(error)) => {
stream.done.set(true);
drop(guard);
self.iterators.pop();
return Err(error);
}
None => {
stream.done.set(true);
drop(guard);
self.iterators.pop();
let frame = self.frames.last_mut().unwrap();
frame.ip = target;
}
}
}
}
super::super::IterState::VmIter { .. } => {
unreachable!("VmIter state handled before this match");
}
}
} else {
let frame = self.frames.last_mut().unwrap();
frame.ip = target;
}
Ok(())
}
pub(super) fn execute_pop_iterator(&mut self) {
self.iterators.pop();
}
}
#[cfg(test)]
mod tests {
use super::*;
use crate::vm::{IterState, Vm};
fn run_iter_init_test(test: impl std::future::Future<Output = ()>) {
let rt = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
.unwrap();
rt.block_on(test);
}
#[test]
fn iter_init_list_keeps_shared_backing_store() {
run_iter_init_test(async {
let items = Rc::new(vec![VmValue::Int(1), VmValue::Int(2)]);
let mut vm = Vm::new();
vm.stack.push(VmValue::List(items.clone()));
vm.execute_iter_init().unwrap();
match vm.iterators.last().unwrap() {
IterState::Vec {
items: iter_items,
idx,
} => {
assert!(Rc::ptr_eq(&items, iter_items));
assert_eq!(*idx, 0);
}
_ => panic!("expected vec iterator state"),
}
});
}
#[test]
fn iter_init_set_keeps_shared_backing_store() {
run_iter_init_test(async {
let items = Rc::new(vec![VmValue::Int(1), VmValue::Int(2)]);
let mut vm = Vm::new();
vm.stack.push(VmValue::Set(items.clone()));
vm.execute_iter_init().unwrap();
match vm.iterators.last().unwrap() {
IterState::Vec {
items: iter_items,
idx,
} => {
assert!(Rc::ptr_eq(&items, iter_items));
assert_eq!(*idx, 0);
}
_ => panic!("expected vec iterator state"),
}
});
}
#[test]
fn iter_init_dict_keeps_shared_entries_and_snapshots_keys() {
run_iter_init_test(async {
let entries = Rc::new(BTreeMap::from([
("a".to_string(), VmValue::Int(1)),
("b".to_string(), VmValue::Int(2)),
]));
let mut vm = Vm::new();
vm.stack.push(VmValue::Dict(entries.clone()));
vm.execute_iter_init().unwrap();
match vm.iterators.last().unwrap() {
IterState::Dict {
entries: iter_entries,
keys,
idx,
} => {
assert!(Rc::ptr_eq(&entries, iter_entries));
assert_eq!(keys.as_slice(), ["a".to_string(), "b".to_string()]);
assert_eq!(*idx, 0);
}
_ => panic!("expected dict iterator state"),
}
});
}
}