From 8f114ad81614577c7ae38d3a9216dbf50c860921 Mon Sep 17 00:00:00 2001
From: blueloveTH <blueloveTH@foxmail.com>
Date: Sun, 19 May 2024 16:10:49 +0800
Subject: [PATCH] some fix

---
 src/ceval.cpp |  7 +++++--
 src/vm.cpp    | 10 +++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/ceval.cpp b/src/ceval.cpp
index 8505cb34..35445ce2 100644
--- a/src/ceval.cpp
+++ b/src/ceval.cpp
@@ -641,8 +641,11 @@ __NEXT_STEP:
         if(py_bool(POPX())) DISPATCH_JUMP(byte.arg)
         DISPATCH()
     case OP_JUMP_IF_TRUE_OR_POP:
-        if(py_bool(POPX())) DISPATCH_JUMP(byte.arg)
-        DISPATCH()
+        if(py_bool(TOP())){
+            DISPATCH_JUMP(byte.arg)
+        }else{
+            DISPATCH()
+        }
     case OP_JUMP_IF_FALSE_OR_POP:
         if(!py_bool(POPX())) DISPATCH_JUMP(byte.arg)
         DISPATCH()
diff --git a/src/vm.cpp b/src/vm.cpp
index 4039a77a..b74e1731 100644
--- a/src/vm.cpp
+++ b/src/vm.cpp
@@ -778,12 +778,12 @@ void VM::__log_s_data(const char* title) {
     SStream ss;
     if(title) ss << title << " | ";
     std::map<PyVar*, int> sp_bases;
-    for(Frame& f: callstack.data()){
+    callstack.apply([&](Frame& f){
         if(f._sp_base == nullptr) PK_FATAL_ERROR();
         sp_bases[f._sp_base] += 1;
-    }
+    });
     Frame* frame = &callstack.top();
-    int line = frame->co->lines[frame->_ip];
+    int line = frame->curr_lineno();
     ss << frame->co->name << ":" << line << " [";
     for(PyVar* p=s_data.begin(); p!=s_data.end(); p++){
         ss << std::string(sp_bases[p], '|');
@@ -809,10 +809,10 @@ void VM::__log_s_data(const char* title) {
         } else if(is_type(obj, tp_tuple)){
             auto& t = CAST(Tuple&, obj);
             ss << "tuple(size=" << t.size() << ")";
-        } else ss << "(" << _type_name(this, obj->type) << ")";
+        } else ss << "(" << _type_name(this, obj.type) << ")";
         ss << ", ";
     }
-    std::string output = ss.str();
+    std::string output = ss.str().str();
     if(!s_data.empty()) {
         output.pop_back(); output.pop_back();
     }