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

fix broken c-api

Browse Source
This commit is contained in:
blueloveTH 2024-01-02 20:19:39 +08:00
parent 5ec1622887
commit 1a8877f28a
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
c_bindings/test.c
View File

@ -381,7 +381,7 @@ int main(int argc, char** argv) {
//this should be catchable //this should be catchable
check(pkpy_exec(vm, "try : test_error_propagate(); except NameError : pass")); check(pkpy_exec(vm, "try : test_error_propagate(); except NameError : pass"));
error(pkpy_error(vm, "_", pkpy_string("test direct error mechanism"))); error(pkpy_error(vm, "Exception", pkpy_string("test direct error mechanism")));
//more complicated error handling //more complicated error handling
check(pkpy_exec(vm, "def error_from_python() : raise NotImplementedError()")); check(pkpy_exec(vm, "def error_from_python() : raise NotImplementedError()"));

2
c_bindings/test_answers.txt
View File

@ -92,7 +92,7 @@ Traceback (most recent call last):
NameError: catch me NameError: catch me
successfully errored with this message: successfully errored with this message:
Traceback (most recent call last): Traceback (most recent call last):
_: test direct error mechanism Exception: test direct error mechanism
successfully errored with this message: successfully errored with this message:
Traceback (most recent call last): Traceback (most recent call last):
File "main.py", line 1 File "main.py", line 1

5
include/pocketpy/error.h
View File

@ -62,6 +62,11 @@ struct Exception {
stack<ExceptionLine> stacktrace; stack<ExceptionLine> stacktrace;
Exception(StrName type): type(type), is_re(true), _ip_on_error(-1), _code_on_error(nullptr), _self(nullptr) {} Exception(StrName type): type(type), is_re(true), _ip_on_error(-1), _code_on_error(nullptr), _self(nullptr) {}
PyObject* self(){
PK_ASSERT(_self != nullptr);
return _self;
}
template<typename... Args> template<typename... Args>
void st_push(Args&&... args){ void st_push(Args&&... args){
if(stacktrace.size() >= 8) return; if(stacktrace.size() >= 8) return;

2
src/pocketpy.cpp
View File

@ -1727,7 +1727,7 @@ CodeObject_ VM::compile(Str source, Str filename, CompileMode mode, bool unknown
#if PK_DEBUG_FULL_EXCEPTION #if PK_DEBUG_FULL_EXCEPTION
std::cerr << e.summary() << std::endl; std::cerr << e.summary() << std::endl;
#endif #endif
_error(e._self); _error(e.self());
return nullptr; return nullptr;
} }
} }

12
src/pocketpy_c.cpp
View File

@ -45,11 +45,12 @@ static PyObject* stack_item(VM* vm, int index){
#define PK_PROTECTED(__B) \ #define PK_PROTECTED(__B) \
try{ __B } \ try{ __B } \
catch(const Exception& e ) { \ catch(const Exception& e ) { \
vm->_c.error = e._self; \ vm->_c.error = e.self(); \
return false; \ return false; \
} catch(const std::exception& re){ \ } catch(const std::exception& re){ \
PyObject* e_t = vm->_t(vm->tp_exception); \ PyObject* e_t = vm->_t(vm->tp_exception); \
vm->_c.error = vm->call(e_t, VAR(re.what())); \ vm->_c.error = vm->call(e_t, VAR(re.what())); \
PK_OBJ_GET(Exception, vm->_c.error)._self = vm->_c.error; \
return false; \ return false; \
} }
@ -338,7 +339,7 @@ static PyObject* c_function_wrapper(VM* vm, ArgsView args) {
// propagate_if_errored // propagate_if_errored
if (vm->_c.error != nullptr){ if (vm->_c.error != nullptr){
PyObject* e_obj = PK_OBJ_GET(Exception, vm->_c.error)._self; PyObject* e_obj = PK_OBJ_GET(Exception, vm->_c.error).self();
vm->_c.error = nullptr; vm->_c.error = nullptr;
vm->_error(e_obj); vm->_error(e_obj);
return nullptr; return nullptr;
@ -495,8 +496,13 @@ bool pkpy_py_str(pkpy_vm* vm_handle) {
bool pkpy_error(pkpy_vm* vm_handle, const char* name, pkpy_CString message) { bool pkpy_error(pkpy_vm* vm_handle, const char* name, pkpy_CString message) {
VM* vm = (VM*) vm_handle; VM* vm = (VM*) vm_handle;
PK_ASSERT_NO_ERROR() PK_ASSERT_NO_ERROR()
PyObject* e_t = vm->_t(vm->tp_exception); PyObject* e_t = vm->builtins->attr().try_get_likely_found(name);
if(e_t == nullptr){
e_t = vm->_t(vm->tp_exception);
std::cerr << "[warning] pkpy_error(): " << Str(name).escape() << " not found, fallback to 'Exception'" << std::endl;
}
vm->_c.error = vm->call(e_t, VAR(std::string_view(message.data, message.size))); vm->_c.error = vm->call(e_t, VAR(std::string_view(message.data, message.size)));
PK_OBJ_GET(Exception, vm->_c.error)._self = vm->_c.error;
return false; return false;
} }