8000 Rename macro · RustPython/RustPython@1a8a1ab · GitHub
[go: up one dir, main page]
Skip to content

Commit 1a8a1ab

Browse files
ShaharNavehShaharNaveh
committed
Rename macro
1 parent 9184d7c commit 1a8a1ab

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

‎vm/src/protocol/iter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ where
278278
}
279279

280280
#[macro_export]
281-
macro_rules! handle_pyiter_return {
281+
macro_rules! raise_stop {
282282
($input:expr) => {
283283
match $input {
284284
$crate::protocol::PyIterReturn::Return(obj) => obj,

‎vm/src/stdlib/itertools.rs

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ mod decl {
1616
},
1717
convert::ToPyObject,
1818
function::{ArgCallable, ArgIntoBool, FuncArgs, OptionalArg, OptionalOption, PosArgs},
19-
handle_pyiter_return, identifier< 10000 span class="pl-kos">,
19+
identifier,
2020
protocol::{PyIter, PyIterReturn, PyNumber},
21+
raise_stop,
2122
stdlib::sys,
2223
types::{Constructor, IterNext, Iterable, Representable, SelfIter},
2324
};
@@ -216,7 +217,7 @@ mod decl {
216217
impl IterNext for PyItertoolsCompress {
217218
fn next(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
218219
loop {
219-
let sel_obj = handle_pyiter_return!(zelf.selectors.next(vm)?);
220+
let sel_obj = raise_stop!(zelf.selectors.next(vm)?);
220221
let verdict = sel_obj.clone().try_to_bool(vm)?;
221222
let data_obj = zelf.data.next(vm)?;
222223

@@ -567,7 +568,7 @@ mod decl {
567568
}
568569

569570
// might be StopIteration or anything else, which is propagated upwards
570-
let obj = handle_pyiter_return!(zelf.iterable.next(vm)?);
571+
let obj = raise_stop!(zelf.iterable.next(vm)?);
571572
let predicate = &zelf.predicate;
572573

573574
let verdict = predicate.call((obj.clone(),), vm)?;
@@ -652,7 +653,7 @@ mod decl {
652653

653654
if !zelf.start_flag.load() {
654655
loop {
655-
let obj = handle_pyiter_return!(iterable.next(vm)?);
656+
let obj = raise_stop!(iterable.next(vm)?);
656657
let pred = predicate.clone();
657658
let pred_value = pred.invoke((obj.clone(),), vm)?;
658659
if !pred_value.try_to_bool(vm)? {
@@ -746,7 +747,7 @@ mod decl {
746747
&self,
747748
vm: &VirtualMachine,
748749
) -> PyResult<PyIterReturn<(PyObjectRef, PyObjectRef)>> {
749-
let new_value = handle_pyiter_return!(self.iterable.next(vm)?);
750+
let new_value = raise_stop!(self.iterable.next(vm)?);
750751
let new_key = if let Some(ref kf) = self.key_func {
751752
kf.call((new_value.clone(),), vm)?
752753
} else {
@@ -770,13 +771,13 @@ mod decl {
770771

771772
let (value, key) = if let Some(old_key) = current_key {
772773
loop {
773-
let (value, new_key) = handle_pyiter_return!(zelf.advance(vm)?);
774+
let (value, new_key) = raise_stop!(zelf.advance(vm)?);
774775
if !vm.bool_eq(&new_key, &old_key)? {
775776
break (value, new_key);
776777
}
777778
}
778779
} else {
779-
handle_pyiter_return!(zelf.advance(vm)?)
780+
raise_stop!(zelf.advance(vm)?)
780781
};
781782

782783
state = zelf.state.lock();
@@ -826,7 +827,7 @@ mod decl {
826827

827828
state.current_key.as_ref().unwrap().clone()
828829
};
829-
let (value, key) = handle_pyiter_return!(zelf.groupby.advance(vm)?);
830+
let (value, key) = raise_stop!(zelf.groupby.advance(vm)?);
830831
if vm.bool_eq(&key, &old_key)? {
831832
Ok(PyIterReturn::Return(value))
832833
} else {
@@ -985,7 +986,7 @@ mod decl {
985986
}
986987
}
987988

988-
let obj = handle_pyiter_return!(zelf.iterable.next(vm)?);
989+
let obj = raise_stop!(zelf.iterable.next(vm)?);
989990
zelf.cur.fetch_add(1);
990991

991992
// TODO is this overflow check required? attempts to copy CPython.
@@ -1051,7 +1052,7 @@ mod decl {
10511052
let iterable = &zelf.iterable;
10521053

10531054
loop {
1054-
let obj = handle_pyiter_return!(iterable.next(vm)?);
1055+
let obj = raise_stop!(iterable.next(vm)?);
10551056
let pred_value = if vm.is_none(predicate) {
10561057
obj.clone()
10571058
} else {
@@ -1163,11 +1164,11 @@ mod decl {
11631164

11641165
let next_acc_value = match acc_value {
11651166
None => match &zelf.initial {
1166-
None => handle_pyiter_return!(iterable.next(vm)?),
1167+
None => raise_stop!(iterable.next(vm)?),
11671168
Some(obj) => obj.clone(),
11681169
},
11691170
Some(value) => {
1170-
let obj = handle_pyiter_return!(iterable.next(vm)?);
1171+
let obj = raise_stop!(iterable.next(vm)?);
11711172
match &zelf.bin_op {
11721173
None => vm._add(&value, &obj)?,
11731174
Some(op) => op.call((value, obj), vm)?,
@@ -1196,7 +1197,7 @@ mod decl {
11961197

11971198
fn get_item(&self, vm: &VirtualMachine, index: usize) -> PyResult<PyIterReturn> {
11981199
if self.values.read().len() == index {
1199-
let result = handle_pyiter_return!(self.iterable.next(vm)?);
1200+
let result = raise_stop!(self.iterable.next(vm)?);
12001201
self.values.write().push(result);
12011202
}
12021203
Ok(PyIterReturn::Return(self.values.read()[index].clone()))
@@ -1272,7 +1273,7 @@ mod decl {
12721273
impl SelfIter for PyItertoolsTee {}
12731274
impl IterNext for PyItertoolsTee {
12741275
fn next(zelf: &Py<Self>, vm: &VirtualMachine) -> PyResult<PyIterReturn> {
1275-
let value = handle_pyiter_return!(zelf.tee_data.get_item(vm, zelf.index.load())?);
1276+
let value = raise_stop!(zelf.tee_data.get_item(vm, zelf.index.load())?);
12761277
zelf.index.fetch_add(1);
12771278
Ok(PyIterReturn::Return(value))
12781279
}
@@ -1929,7 +1930,7 @@ mod decl {
19291930
Some(obj) => obj,
19301931
};
19311932

1932-
let new = handle_pyiter_return!(zelf.iterator 5142 .next(vm)?);
1933+
let new = raise_stop!(zelf.iterator.next(vm)?);
19331934
*zelf.old.write() = Some(new.clone());
19341935

19351936
Ok(PyIterReturn::Return(vm.new_tuple((old, new)).into()))

0 commit comments

Comments
 (0)
0