Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-20 11:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

list.index supports __start

Browse Source
This commit is contained in:
blueloveTH 2024-02-17 20:36:20 +08:00
parent caba557c83
commit 96d9e12cd6
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/collections.cpp
View File

@ -258,17 +258,11 @@ namespace pkpy
// Return the position of x in the deque (at or after index start and before index stop). Returns the first match or raises ValueError if not found. // Return the position of x in the deque (at or after index start and before index stop). Returns the first match or raises ValueError if not found.
PyDeque &self = _CAST(PyDeque &, args[0]); PyDeque &self = _CAST(PyDeque &, args[0]);
PyObject *obj = args[1]; PyObject *obj = args[1];
int start = 0, stop = self.dequeItems.size(); // default values int start = CAST_DEFAULT(int, args[2], 0);
if (!vm->py_eq(args[2], vm->None)) int stop = CAST_DEFAULT(int, args[3], self.dequeItems.size());
start = CAST(int, args[2]);
if (!vm->py_eq(args[3], vm->None))
stop = CAST(int, args[3]);
int index = self.findIndex(vm, obj, start, stop); int index = self.findIndex(vm, obj, start, stop);
if (index != -1) if (index < 0) vm->ValueError(_CAST(Str &, vm->py_repr(obj)) + " is not in deque");
return VAR(index); return VAR(index);
else
vm->ValueError(_CAST(Str &, vm->py_repr(obj)) + " is not in deque");
return vm->None;
}); });
// NEW: returns the index of the given object in the deque // NEW: returns the index of the given object in the deque
vm->bind(type, "__contains__(self, obj) -> bool", vm->bind(type, "__contains__(self, obj) -> bool",

5
src/pocketpy.cpp
View File

@ -803,10 +803,11 @@ void init_builtins(VM* _vm) {
return vm->True; return vm->True;
}); });
_vm->bind_method<1>(VM::tp_list, "index", [](VM* vm, ArgsView args) { _vm->bind(_vm->_t(VM::tp_list), "index(self, value, __start=0)", [](VM* vm, ArgsView args) {
List& self = _CAST(List&, args[0]); List& self = _CAST(List&, args[0]);
PyObject* obj = args[1]; PyObject* obj = args[1];
for(int i=0; i<self.size(); i++){ int start = CAST(int, args[2]);
for(int i=start; i<self.size(); i++){
if(vm->py_eq(self[i], obj)) return VAR(i); if(vm->py_eq(self[i], obj)) return VAR(i);
} }
vm->ValueError(_CAST(Str&, vm->py_repr(obj)) + " is not in list"); vm->ValueError(_CAST(Str&, vm->py_repr(obj)) + " is not in list");

13
tests/05_list.py
View File

@ -116,3 +116,16 @@ assert A()[::, :2] == (slice(None, None, None), slice(None, 2, None))
assert A()['b':'c':1, :] == (slice('b', 'c', 1), slice(None, None, None)) assert A()['b':'c':1, :] == (slice('b', 'c', 1), slice(None, None, None))
assert A()[1:2, :A()[3:4, ::-1]] == (slice(1, 2, None), slice(None, (slice(3, 4, None), slice(None, None, -1)), None)) assert A()[1:2, :A()[3:4, ::-1]] == (slice(1, 2, None), slice(None, (slice(3, 4, None), slice(None, None, -1)), None))
a = [1, 2, 3]
assert a.index(2) == 1
assert a.index(1) == 0
assert a.index(3) == 2
assert a.index(2, 1) == 1
assert a.index(1, 0) == 0
try:
a.index(1, 1)
exit(1)
except ValueError:
pass