This commit is contained in:
blueloveTH 2024-06-26 13:17:29 +08:00
parent d44781fa1e
commit cff541b94b
2 changed files with 11 additions and 11 deletions

View File

@ -12,8 +12,6 @@ typedef int16_t py_Type;
typedef PyVar* py_Ref; typedef PyVar* py_Ref;
typedef int (*py_CFunction)(int argc, py_Ref argv); typedef int (*py_CFunction)(int argc, py_Ref argv);
typedef struct py_Str py_Str;
typedef struct py_Error{ typedef struct py_Error{
py_Type type; py_Type type;
} py_Error; } py_Error;
@ -78,8 +76,8 @@ int64_t py_toint(py_Ref);
double py_tofloat(py_Ref); double py_tofloat(py_Ref);
bool py_castfloat(py_Ref, double* out); bool py_castfloat(py_Ref, double* out);
bool py_tobool(py_Ref); bool py_tobool(py_Ref);
const py_Str* py_tostr(py_Ref); const char* py_tostr(py_Ref);
const char* py_tocstr(py_Ref); const char* py_tostrn(py_Ref, int* out);
void* py_touserdata(py_Ref); void* py_touserdata(py_Ref);
@ -173,8 +171,8 @@ void py_dict__setitem(py_Ref self, const py_Ref key, const py_Ref val);
void py_dict__delitem(py_Ref self, const py_Ref key); void py_dict__delitem(py_Ref self, const py_Ref key);
void py_dict__clear(py_Ref self); void py_dict__clear(py_Ref self);
int py_str(const py_Ref, py_Str* out); int py_str(const py_Ref, char* out);
int py_repr(const py_Ref, py_Str* out); int py_repr(const py_Ref, char* out);
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@ -32,13 +32,15 @@ bool py_tobool(py_Ref self){
return self->extra; return self->extra;
} }
const py_Str* py_tostr(py_Ref self){ const char* py_tostr(py_Ref self){
return PyObject__value(self->_obj); py_Str* ud = PyObject__value(self->_obj);
return py_Str__data(ud);
} }
const char* py_tocstr(py_Ref self){ const char* py_tostrn(py_Ref self, int* out){
const py_Str* s = PyObject__value(self->_obj); py_Str* ud = PyObject__value(self->_obj);
return py_Str__data(s); *out = ud->size;
return py_Str__data(ud);
} }
void* py_touserdata(py_Ref self){ void* py_touserdata(py_Ref self){