Merge omega-dev into upsilon dev

This commit is contained in:
Laury
2021-08-31 23:03:30 +02:00
233 changed files with 3248 additions and 1837 deletions

View File

@@ -591,11 +591,13 @@ Q(SEEK_END)
// os QSTRs
Q(os)
Q(uname)
Q(getlogin)
Q(sysname)
Q(nodename)
Q(release)
Q(version)
Q(machine)
Q(username)
Q(rename)
Q(listdir)

View File

@@ -7,6 +7,7 @@ extern "C" {
#include <py/objtuple.h>
}
#include <ion.h>
#include <ion/storage.h>
#ifndef OMEGA_VERSION
@@ -46,6 +47,10 @@ mp_obj_t modos_uname(void) {
return (mp_obj_t)&modos_uname_info_obj;
}
mp_obj_t modos_getlogin(void) {
return mp_obj_new_str((const char *)Ion::username(), MIN(strlen((const char *)Ion::username()), 16));
}
mp_obj_t modos_remove(mp_obj_t o_file_name) {
size_t len;

View File

@@ -1,6 +1,7 @@
#include <py/obj.h>
mp_obj_t modos_uname();
mp_obj_t modos_getlogin();
mp_obj_t modos_remove(mp_obj_t o_file_name);
mp_obj_t modos_rename(mp_obj_t o_old_name, mp_obj_t o_new_name);
mp_obj_t modos_listdir();

View File

@@ -1,16 +1,25 @@
#include "modos.h"
#include <string.h>
#include <py/obj.h>
#include <py/objstr.h>
MP_DEFINE_CONST_FUN_OBJ_0(modos_uname_obj, modos_uname);
MP_DEFINE_CONST_FUN_OBJ_0(modos_getlogin_obj, modos_getlogin);
MP_DEFINE_CONST_FUN_OBJ_1(modos_remove_obj, modos_remove);
MP_DEFINE_CONST_FUN_OBJ_2(modos_rename_obj, modos_rename);
MP_DEFINE_CONST_FUN_OBJ_0(modos_listdir_obj, modos_listdir);
STATIC const MP_DEFINE_STR_OBJ(modos_sysname_obj, "Omega");
STATIC const mp_rom_map_elem_t modos_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_os) },
{ MP_ROM_QSTR(MP_QSTR_uname), &modos_uname_obj},
{ MP_ROM_QSTR(MP_QSTR_getlogin), &modos_getlogin_obj},
{ MP_ROM_QSTR(MP_QSTR_remove), &modos_remove_obj},
{ MP_ROM_QSTR(MP_QSTR_rename), &modos_rename_obj},
{ MP_ROM_QSTR(MP_QSTR_listdir), &modos_listdir_obj},
{ MP_ROM_QSTR(MP_QSTR_name), &modos_sysname_obj}
};
STATIC MP_DEFINE_CONST_DICT(modos_module_globals, modos_module_globals_table);