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

change type names

Browse Source
This commit is contained in:
blueloveTH 2024-07-10 00:19:47 +08:00
parent 35f03bf2e2
commit 79ac343eb2
7 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/pocketpy/pocketpy.h
View File

@ -322,7 +322,7 @@ bool py_str(py_Ref val);
py_GlobalRef py_retval(); py_GlobalRef py_retval();
#define py_isnil(self) py_istype(self, 0) #define py_isnil(self) py_istype(self, 0)
#define py_isnone(self) py_istype(self, tp_none_type) #define py_isnone(self) py_istype(self, tp_NoneType)
/* tuple */ /* tuple */
@ -410,10 +410,10 @@ enum py_PredefinedTypes {
tp_module, tp_module,
tp_function, tp_function,
tp_nativefunc, tp_nativefunc,
tp_bound_method, tp_boundmethod,
tp_super, // 1 slot + py_Type tp_super, // 1 slot + py_Type
tp_base_exception, tp_BaseException,
tp_exception, tp_Exception,
tp_bytes, tp_bytes,
tp_mappingproxy, tp_mappingproxy,
tp_dict, tp_dict,
@ -421,11 +421,11 @@ enum py_PredefinedTypes {
tp_star_wrapper, tp_star_wrapper,
tp_staticmethod, // 1 slot tp_staticmethod, // 1 slot
tp_classmethod, // 1 slot tp_classmethod, // 1 slot
tp_none_type, tp_NoneType,
tp_not_implemented_type, tp_NotImplementedType,
tp_ellipsis, tp_ellipsis,
tp_syntax_error, tp_SyntaxError,
tp_stop_iteration, tp_StopIteration,
}; };
#ifdef __cplusplus #ifdef __cplusplus

6
src/interpreter/ceval.c
View File

@ -110,7 +110,7 @@ pk_FrameResult pk_VM__run_top_frame(pk_VM* self) {
DISPATCH(); DISPATCH();
} }
case OP_PRINT_EXPR: case OP_PRINT_EXPR:
if(TOP()->type != tp_none_type) { if(TOP()->type != tp_NoneType) {
bool ok = py_repr(TOP()); bool ok = py_repr(TOP());
if(!ok) goto __ERROR; if(!ok) goto __ERROR;
self->_stdout("%s\n", py_tostr(&self->last_retval)); self->_stdout("%s\n", py_tostr(&self->last_retval));
@ -756,7 +756,7 @@ bool pk_stack_binaryop(pk_VM* self, py_Name op, py_Name rop) {
if(magic) { if(magic) {
bool ok = py_call(magic, 2, SECOND()); bool ok = py_call(magic, 2, SECOND());
if(!ok) return false; if(!ok) return false;
if(self->last_retval.type != tp_not_implemented_type) return true; if(self->last_retval.type != tp_NotImplementedType) return true;
} }
// try reverse operation // try reverse operation
if(rop) { if(rop) {
@ -768,7 +768,7 @@ bool pk_stack_binaryop(pk_VM* self, py_Name op, py_Name rop) {
if(magic) { if(magic) {
bool ok = py_call(magic, 2, SECOND()); bool ok = py_call(magic, 2, SECOND());
if(!ok) return false; if(!ok) return false;
if(self->last_retval.type != tp_not_implemented_type) return true; if(self->last_retval.type != tp_NotImplementedType) return true;
} }
} }
// eq/ne op never fails due to object.__eq__ // eq/ne op never fails due to object.__eq__

26
src/interpreter/vm.c
View File

@ -109,11 +109,11 @@ void pk_VM__ctor(pk_VM* self) {
validate(tp_function, pk_function__register()); validate(tp_function, pk_function__register());
validate(tp_nativefunc, pk_nativefunc__register()); validate(tp_nativefunc, pk_nativefunc__register());
validate(tp_bound_method, pk_VM__new_type(self, "bound_method", tp_object, NULL, false)); validate(tp_boundmethod, pk_VM__new_type(self, "boundmethod", tp_object, NULL, false));
validate(tp_super, pk_VM__new_type(self, "super", tp_object, NULL, false)); validate(tp_super, pk_VM__new_type(self, "super", tp_object, NULL, false));
validate(tp_base_exception, pk_BaseException__register()); validate(tp_BaseException, pk_BaseException__register());
validate(tp_exception, pk_Exception__register()); validate(tp_Exception, pk_Exception__register());
validate(tp_bytes, pk_bytes__register()); validate(tp_bytes, pk_bytes__register());
validate(tp_mappingproxy, pk_VM__new_type(self, "mappingproxy", tp_object, NULL, false)); validate(tp_mappingproxy, pk_VM__new_type(self, "mappingproxy", tp_object, NULL, false));
@ -124,13 +124,13 @@ void pk_VM__ctor(pk_VM* self) {
validate(tp_staticmethod, pk_VM__new_type(self, "staticmethod", tp_object, NULL, false)); validate(tp_staticmethod, pk_VM__new_type(self, "staticmethod", tp_object, NULL, false));
validate(tp_classmethod, pk_VM__new_type(self, "classmethod", tp_object, NULL, false)); validate(tp_classmethod, pk_VM__new_type(self, "classmethod", tp_object, NULL, false));
validate(tp_none_type, pk_VM__new_type(self, "NoneType", tp_object, NULL, false)); validate(tp_NoneType, pk_VM__new_type(self, "NoneType", tp_object, NULL, false));
validate(tp_not_implemented_type, validate(tp_NotImplementedType,
pk_VM__new_type(self, "NotImplementedType", tp_object, NULL, false)); pk_VM__new_type(self, "NotImplementedType", tp_object, NULL, false));
validate(tp_ellipsis, pk_VM__new_type(self, "ellipsis", tp_object, NULL, false)); validate(tp_ellipsis, pk_VM__new_type(self, "ellipsis", tp_object, NULL, false));
validate(tp_syntax_error, pk_VM__new_type(self, "SyntaxError", tp_exception, NULL, false)); validate(tp_SyntaxError, pk_VM__new_type(self, "SyntaxError", tp_Exception, NULL, false));
validate(tp_stop_iteration, pk_VM__new_type(self, "StopIteration", tp_exception, NULL, false)); validate(tp_StopIteration, pk_VM__new_type(self, "StopIteration", tp_Exception, NULL, false));
#undef validate #undef validate
self->builtins = pk_builtins__register(); self->builtins = pk_builtins__register();
@ -149,10 +149,10 @@ void pk_VM__ctor(pk_VM* self) {
tp_bytes, tp_bytes,
tp_dict, tp_dict,
tp_property, tp_property,
tp_base_exception, tp_BaseException,
tp_exception, tp_Exception,
tp_stop_iteration, tp_StopIteration,
tp_syntax_error}; tp_SyntaxError};
for(int i = 0; i < c11__count_array(public_types); i++) { for(int i = 0; i < c11__count_array(public_types); i++) {
py_Type t = public_types[i]; py_Type t = public_types[i];
@ -343,7 +343,7 @@ pk_FrameResult pk_VM__vectorcall(pk_VM* self, uint16_t argc, uint16_t kwargc, bo
#if 0 #if 0
// handle boundmethod, do a patch // handle boundmethod, do a patch
if(p0->type == tp_bound_method) { if(p0->type == tp_boundmethod) {
assert(false); assert(false);
assert(py_isnil(p0 + 1)); // self must be NULL assert(py_isnil(p0 + 1)); // self must be NULL
// BoundMethod& bm = PK_OBJ_GET(BoundMethod, callable); // BoundMethod& bm = PK_OBJ_GET(BoundMethod, callable);
@ -576,7 +576,7 @@ void pk_print_stack(pk_VM* self, Frame* frame, Bytecode byte) {
case tp_int: c11_sbuf__write_i64(&buf, p->_i64); break; case tp_int: c11_sbuf__write_i64(&buf, p->_i64); break;
case tp_float: c11_sbuf__write_f64(&buf, p->_f64, -1); break; case tp_float: c11_sbuf__write_f64(&buf, p->_f64, -1); break;
case tp_bool: c11_sbuf__write_cstr(&buf, p->_bool ? "True" : "False"); break; case tp_bool: c11_sbuf__write_cstr(&buf, p->_bool ? "True" : "False"); break;
case tp_none_type: c11_sbuf__write_cstr(&buf, "None"); break; case tp_NoneType: c11_sbuf__write_cstr(&buf, "None"); break;
case tp_list: { case tp_list: {
pk_sprintf(&buf, "list(%d)", py_list__len(p)); pk_sprintf(&buf, "list(%d)", py_list__len(p));
break; break;

2
src/public/error.c
View File

@ -40,7 +40,7 @@ bool py_exception(const char* name, const char* fmt, ...) {
py_Ref message = py_pushtmp(); py_Ref message = py_pushtmp();
py_newstrn(message, res->data, res->size); py_newstrn(message, res->data, res->size);
c11_string__delete(res); c11_string__delete(res);
bool ok = py_tpcall(tp_exception, 1, message); bool ok = py_tpcall(tp_Exception, 1, message);
py_pop(); py_pop();
if(!ok) abort(); if(!ok) abort();

2
src/public/py_exception.c
View File

@ -76,6 +76,6 @@ py_Type pk_BaseException__register() {
py_Type pk_Exception__register() { py_Type pk_Exception__register() {
pk_VM* vm = pk_current_vm; pk_VM* vm = pk_current_vm;
py_Type type = pk_VM__new_type(vm, "Exception", tp_base_exception, NULL, true); py_Type type = pk_VM__new_type(vm, "Exception", tp_BaseException, NULL, true);
return type; return type;
} }

6
src/public/py_ops.c
View File

@ -9,8 +9,8 @@ bool py_isidentical(const py_Ref lhs, const py_Ref rhs) {
case tp_float: return lhs->_f64 == rhs->_f64; case tp_float: return lhs->_f64 == rhs->_f64;
case tp_bool: return lhs->_bool == rhs->_bool; case tp_bool: return lhs->_bool == rhs->_bool;
case tp_nativefunc: return lhs->_cfunc == rhs->_cfunc; case tp_nativefunc: return lhs->_cfunc == rhs->_cfunc;
case tp_none_type: return true; case tp_NoneType: return true;
case tp_not_implemented_type: return true; case tp_NotImplementedType: return true;
case tp_ellipsis: return true; case tp_ellipsis: return true;
// fallback to pointer comparison // fallback to pointer comparison
default: return lhs->is_ptr && rhs->is_ptr && lhs->_obj == rhs->_obj; default: return lhs->is_ptr && rhs->is_ptr && lhs->_obj == rhs->_obj;
@ -22,7 +22,7 @@ int py_bool(const py_Ref val) {
case tp_bool: return val->_bool; case tp_bool: return val->_bool;
case tp_int: return val->_i64 != 0; case tp_int: return val->_i64 != 0;
case tp_float: return val->_f64 != 0; case tp_float: return val->_f64 != 0;
case tp_none_type: return 0; case tp_NoneType: return 0;
default: { default: {
py_Ref tmp = py_tpfindmagic(val->type, __bool__); py_Ref tmp = py_tpfindmagic(val->type, __bool__);
if(tmp) { if(tmp) {

4
src/public/values.c
View File

@ -26,12 +26,12 @@ void py_newbool(py_Ref out, bool val) {
} }
void py_newnone(py_Ref out) { void py_newnone(py_Ref out) {
out->type = tp_none_type; out->type = tp_NoneType;
out->is_ptr = false; out->is_ptr = false;
} }
void py_newnotimplemented(py_Ref out) { void py_newnotimplemented(py_Ref out) {
out->type = tp_not_implemented_type; out->type = tp_NotImplementedType;
out->is_ptr = false; out->is_ptr = false;
} }