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

...

Browse Source
This commit is contained in:
blueloveTH 2023-06-10 00:30:53 +08:00
parent 1e89045f82
commit 07d8a520bf
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ceval.h
View File

@ -598,7 +598,6 @@ __NEXT_STEP:;
TOP()->attr().set(_name, _0); TOP()->attr().set(_name, _0);
DISPATCH(); DISPATCH();
/*****************************************/ /*****************************************/
// TODO: using "goto" inside with block may cause __exit__ not called
TARGET(WITH_ENTER) TARGET(WITH_ENTER)
call_method(POPX(), __enter__); call_method(POPX(), __enter__);
DISPATCH(); DISPATCH();

2
src/expr.h
View File

@ -497,7 +497,7 @@ struct CompExpr: Expr{
ctx->emit(OP_FOR_ITER, BC_NOARG, BC_KEEPLINE); ctx->emit(OP_FOR_ITER, BC_NOARG, BC_KEEPLINE);
bool ok = vars->emit_store(ctx); bool ok = vars->emit_store(ctx);
// this error occurs in `vars` instead of this line, but...nevermind // this error occurs in `vars` instead of this line, but...nevermind
if(!ok) FATAL_ERROR(); // TODO: raise a SyntaxError instead PK_ASSERT(ok); // TODO: raise a SyntaxError instead
if(cond){ if(cond){
cond->emit(ctx); cond->emit(ctx);
int patch = ctx->emit(OP_POP_JUMP_IF_FALSE, BC_NOARG, BC_KEEPLINE); int patch = ctx->emit(OP_POP_JUMP_IF_FALSE, BC_NOARG, BC_KEEPLINE);

10
src/frame.h
View File

@ -49,12 +49,10 @@ struct FastLocals{
NameDict_ to_namedict(){ NameDict_ to_namedict(){
NameDict_ dict = make_sp<NameDict>(); NameDict_ dict = make_sp<NameDict>();
// TODO: optimize this, NameDict.items() is expensive varnames_inv->apply([&](StrName name, int index){
for(auto& kv: varnames_inv->items()){ PyObject* value = a[index];
PyObject* value = a[kv.second]; if(value != PY_NULL) dict->set(name, value);
if(value == PY_NULL) continue; });
dict->set(kv.first, value);
}
return dict; return dict;
} }
}; };

8
src/namedict.h
View File

@ -182,6 +182,14 @@ while(!_items[i].first.empty()) { \
return v; return v;
} }
template<typename __Func>
void apply(__Func func) const {
for(uint16_t i=0; i<_capacity; i++){
if(_items[i].first.empty()) continue;
func(_items[i].first, _items[i].second);
}
}
std::vector<StrName> keys() const { std::vector<StrName> keys() const {
std::vector<StrName> v; std::vector<StrName> v;
for(uint16_t i=0; i<_capacity; i++){ for(uint16_t i=0; i<_capacity; i++){