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

fix an internal bug of dict

Browse Source
This commit is contained in:
blueloveTH 2023-08-13 01:39:37 +08:00
parent b42a2d5b26
commit 0bd7b45160
3 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pocketpy.cpp
View File

@ -1089,6 +1089,29 @@ void init_builtins(VM* _vm) {
return value; return value;
}); });
// _vm->bind_method<0>("dict", "_data", [](VM* vm, ArgsView args) {
// Dict& self = _CAST(Dict&, args[0]);
// std::stringstream ss;
// ss << "[\n";
// for(int i=0; i<self._capacity; i++){
// auto item = self._items[i];
// Str key("None");
// Str value("None");
// if(item.first != nullptr){
// key = CAST(Str&, vm->py_repr(item.first));
// }
// if(item.second != nullptr){
// value = CAST(Str&, vm->py_repr(item.second));
// }
// int prev = self._nodes[i].prev;
// int next = self._nodes[i].next;
// ss << " [" << key << ", " << value << ", " << prev << ", " << next << "],\n";
// }
// ss << "]\n";
// vm->stdout_write(ss.str());
// return vm->None;
// });
_vm->bind__contains__(_vm->tp_dict, [](VM* vm, PyObject* obj, PyObject* key) { _vm->bind__contains__(_vm->tp_dict, [](VM* vm, PyObject* obj, PyObject* key) {
Dict& self = _CAST(Dict&, obj); Dict& self = _CAST(Dict&, obj);
return VAR(self.contains(key)); return VAR(self.contains(key));

4
src/vm.cpp
View File

@ -1033,7 +1033,9 @@ void VM::bind__len__(Type type, i64 (*f)(VM*, PyObject*)){
void Dict::_probe(PyObject *key, bool &ok, int &i) const{ void Dict::_probe(PyObject *key, bool &ok, int &i) const{
ok = false; ok = false;
i = vm->py_hash(key) & _mask; i64 hash = vm->py_hash(key);
if(hash < 0) hash = -hash;
i = hash & _mask;
while(_items[i].first != nullptr) { while(_items[i].first != nullptr) {
if(vm->py_equals(_items[i].first, key)) { ok = true; break; } if(vm->py_equals(_items[i].first, key)) { ok = true; break; }
// https://github.com/python/cpython/blob/3.8/Objects/dictobject.c#L166 // https://github.com/python/cpython/blob/3.8/Objects/dictobject.c#L166

31
tests/07_dict.py
View File

@ -91,30 +91,7 @@ for i, s in enumerate(a):
assert s == str(i) assert s == str(i)
# destroy: ball_0 a = {'g': 0}
# ('g', 'ball_0') ball_0 True
# destroy: ball_1
# ('g', 'ball_1') ball_1 True
# destroy: ball_2
# ('g', 'ball_2') ball_2 True
# destroy: ball_3
# ('g', 'ball_3', 'ball_4') ball_3 True
# destroy: ball_4
# ('g', 'ball_4') ball_4 False
a = {'g': 0, 'ball_0': 0}
del a['ball_0']
assert a.keys() == ('g',)
a['ball_1'] = 0
assert a.keys() == ('g', 'ball_1')
del a['ball_1']
assert a.keys() == ('g',)
a['ball_2'] = 0
assert a.keys() == ('g', 'ball_2')
del a['ball_2']
assert a.keys() == ('g',)
a['ball_3'] = 0 a['ball_3'] = 0
a['ball_4'] = 0 a['ball_4'] = 0
@ -122,7 +99,7 @@ assert a.keys() == ('g', 'ball_3', 'ball_4')
del a['ball_3'] del a['ball_3']
assert a.keys() == ('g', 'ball_4') assert a.keys() == ('g', 'ball_4')
del a['ball_4'] del a['ball_4']
assert a.keys() == ('g',)
del a['g'] # assert a.keys() == ('g',)
assert len(a) == 0 # del a['g']
# assert len(a) == 0