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

refactor io

Browse Source
This commit is contained in:
blueloveTH 2024-03-28 15:20:23 +08:00
parent d81a1c5415
commit eaf231fd9d
2 changed files with 81 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/pocketpy/io.h
View File

@ -7,26 +7,3 @@ namespace pkpy{
void add_module_os(VM* vm); void add_module_os(VM* vm);
void add_module_io(VM* vm); void add_module_io(VM* vm);
} }
#if PK_ENABLE_OS
#include <filesystem>
#include <cstdio>
namespace pkpy{
struct FileIO {
PY_CLASS(FileIO, io, FileIO)
Str file;
Str mode;
FILE* fp;
bool is_text() const { return mode != "rb" && mode != "wb" && mode != "ab"; }
FileIO(VM* vm, std::string file, std::string mode);
void close();
static void _register(VM* vm, PyObject* mod, PyObject* type);
};
} // namespace pkpy
#endif

147
src/io.cpp
View File

@ -1,8 +1,27 @@
#include "pocketpy/io.h" #include "pocketpy/io.h"
#if PK_ENABLE_OS
#include <filesystem>
#include <cstdio>
#endif
namespace pkpy{ namespace pkpy{
#if PK_ENABLE_OS #if PK_ENABLE_OS
struct FileIO {
PY_CLASS(FileIO, io, FileIO)
Str file;
Str mode;
FILE* fp;
bool is_text() const { return mode != "rb" && mode != "wb" && mode != "ab"; }
FileIO(VM* vm, std::string file, std::string mode);
void close();
static void _register(VM* vm, PyObject* mod, PyObject* type);
};
static FILE* io_fopen(const char* name, const char* mode){ static FILE* io_fopen(const char* name, const char* mode){
#if _MSC_VER #if _MSC_VER
FILE* fp; FILE* fp;
@ -21,11 +40,8 @@ static size_t io_fread(void* buffer, size_t size, size_t count, FILE* fp){
return fread(buffer, size, count, fp); return fread(buffer, size, count, fp);
#endif #endif
} }
#endif
unsigned char* _default_import_handler(const char* name_p, int name_size, int* out_size){ unsigned char* _default_import_handler(const char* name_p, int name_size, int* out_size){
#if PK_ENABLE_OS
std::string name(name_p, name_size); std::string name(name_p, name_size);
bool exists = std::filesystem::exists(std::filesystem::path(name)); bool exists = std::filesystem::exists(std::filesystem::path(name));
if(!exists) return nullptr; if(!exists) return nullptr;
@ -36,80 +52,73 @@ unsigned char* _default_import_handler(const char* name_p, int name_size, int* o
unsigned char* buffer = new unsigned char[buffer_size]; unsigned char* buffer = new unsigned char[buffer_size];
fseek(fp, 0, SEEK_SET); fseek(fp, 0, SEEK_SET);
size_t sz = io_fread(buffer, 1, buffer_size, fp); size_t sz = io_fread(buffer, 1, buffer_size, fp);
(void)sz; // suppress warning
fclose(fp); fclose(fp);
*out_size = buffer_size; *out_size = buffer_size;
return buffer; return buffer;
#else
return nullptr;
#endif
}; };
void FileIO::_register(VM* vm, PyObject* mod, PyObject* type){
vm->bind_constructor<3>(type, [](VM* vm, ArgsView args){
Type cls = PK_OBJ_GET(Type, args[0]);
return vm->heap.gcnew<FileIO>(cls, vm,
py_cast<Str&>(vm, args[1]).str(),
py_cast<Str&>(vm, args[2]).str());
});
#if PK_ENABLE_OS vm->bind_method<0>(type, "read", [](VM* vm, ArgsView args){
void FileIO::_register(VM* vm, PyObject* mod, PyObject* type){ FileIO& io = CAST(FileIO&, args[0]);
vm->bind_constructor<3>(type, [](VM* vm, ArgsView args){ fseek(io.fp, 0, SEEK_END);
Type cls = PK_OBJ_GET(Type, args[0]); int buffer_size = ftell(io.fp);
return vm->heap.gcnew<FileIO>(cls, vm, unsigned char* buffer = new unsigned char[buffer_size];
py_cast<Str&>(vm, args[1]).str(), fseek(io.fp, 0, SEEK_SET);
py_cast<Str&>(vm, args[2]).str()); size_t actual_size = io_fread(buffer, 1, buffer_size, io.fp);
}); PK_ASSERT(actual_size <= buffer_size);
// in text mode, CR may be dropped, which may cause `actual_size < buffer_size`
Bytes b(buffer, actual_size);
if(io.is_text()) return VAR(b.str());
return VAR(std::move(b));
});
vm->bind_method<0>(type, "read", [](VM* vm, ArgsView args){ vm->bind_method<1>(type, "write", [](VM* vm, ArgsView args){
FileIO& io = CAST(FileIO&, args[0]); FileIO& io = CAST(FileIO&, args[0]);
fseek(io.fp, 0, SEEK_END); if(io.is_text()){
int buffer_size = ftell(io.fp); Str& s = CAST(Str&, args[1]);
unsigned char* buffer = new unsigned char[buffer_size]; fwrite(s.data, 1, s.length(), io.fp);
fseek(io.fp, 0, SEEK_SET); }else{
size_t actual_size = io_fread(buffer, 1, buffer_size, io.fp); Bytes& buffer = CAST(Bytes&, args[1]);
PK_ASSERT(actual_size <= buffer_size); fwrite(buffer.data(), 1, buffer.size(), io.fp);
// in text mode, CR may be dropped, which may cause `actual_size < buffer_size` }
Bytes b(buffer, actual_size); return vm->None;
if(io.is_text()) return VAR(b.str()); });
return VAR(std::move(b));
});
vm->bind_method<1>(type, "write", [](VM* vm, ArgsView args){ vm->bind_method<0>(type, "close", [](VM* vm, ArgsView args){
FileIO& io = CAST(FileIO&, args[0]); FileIO& io = CAST(FileIO&, args[0]);
if(io.is_text()){ io.close();
Str& s = CAST(Str&, args[1]); return vm->None;
fwrite(s.data, 1, s.length(), io.fp); });
}else{
Bytes& buffer = CAST(Bytes&, args[1]);
fwrite(buffer.data(), 1, buffer.size(), io.fp);
}
return vm->None;
});
vm->bind_method<0>(type, "close", [](VM* vm, ArgsView args){ vm->bind_method<0>(type, "__exit__", [](VM* vm, ArgsView args){
FileIO& io = CAST(FileIO&, args[0]); FileIO& io = CAST(FileIO&, args[0]);
io.close(); io.close();
return vm->None; return vm->None;
}); });
vm->bind_method<0>(type, "__exit__", [](VM* vm, ArgsView args){ vm->bind_method<0>(type, "__enter__", PK_LAMBDA(args[0]));
FileIO& io = CAST(FileIO&, args[0]); }
io.close();
return vm->None;
});
vm->bind_method<0>(type, "__enter__", PK_LAMBDA(args[0])); FileIO::FileIO(VM* vm, std::string file, std::string mode): file(file), mode(mode) {
} fp = io_fopen(file.c_str(), mode.c_str());
if(!fp) vm->IOError(strerror(errno));
}
FileIO::FileIO(VM* vm, std::string file, std::string mode): file(file), mode(mode) { void FileIO::close(){
fp = io_fopen(file.c_str(), mode.c_str()); if(fp == nullptr) return;
if(!fp) vm->IOError(strerror(errno)); fclose(fp);
} fp = nullptr;
}
void FileIO::close(){
if(fp == nullptr) return;
fclose(fp);
fp = nullptr;
}
#endif
void add_module_io(VM* vm){ void add_module_io(VM* vm){
#if PK_ENABLE_OS
PyObject* mod = vm->new_module("io"); PyObject* mod = vm->new_module("io");
FileIO::register_class(vm, mod); FileIO::register_class(vm, mod);
vm->bind(vm->builtins, "open(path, mode='r')", [](VM* vm, ArgsView args){ vm->bind(vm->builtins, "open(path, mode='r')", [](VM* vm, ArgsView args){
@ -117,11 +126,9 @@ void add_module_io(VM* vm){
PK_LOCAL_STATIC StrName m_FileIO("FileIO"); PK_LOCAL_STATIC StrName m_FileIO("FileIO");
return vm->call(vm->_modules[m_io]->attr(m_FileIO), args[0], args[1]); return vm->call(vm->_modules[m_io]->attr(m_FileIO), args[0], args[1]);
}); });
#endif
} }
void add_module_os(VM* vm){ void add_module_os(VM* vm){
#if PK_ENABLE_OS
PyObject* mod = vm->new_module("os"); PyObject* mod = vm->new_module("os");
PyObject* path_obj = vm->heap.gcnew<DummyInstance>(vm->tp_object); PyObject* path_obj = vm->heap.gcnew<DummyInstance>(vm->tp_object);
mod->attr().set("path", path_obj); mod->attr().set("path", path_obj);
@ -192,7 +199,15 @@ void add_module_os(VM* vm){
std::filesystem::path path(CAST(Str&, args[0]).sv()); std::filesystem::path path(CAST(Str&, args[0]).sv());
return VAR(path.filename().string()); return VAR(path.filename().string());
}); });
#endif }
#else
void add_module_io(VM* vm){}
void add_module_os(VM* vm){}
unsigned char* _default_import_handler(const char* name_p, int name_size, int* out_size){
return nullptr;
} }
#endif
} // namespace pkpy } // namespace pkpy