JDBtracker
/
libcubescript
forked from OctaForge/libcubescript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change stdlib init stuff

master
Daniel Kolesa 2016-02-28 22:21:28 +00:00
parent 3f6f85645d
commit 78568e4161
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cubescript.cc
View File

@ -3528,7 +3528,7 @@ bool CsState::run_file(ostd::ConstCharRange fname) {
return true;
}
void init_lib_io(CsState &cs) {
static void cs_init_lib_io(CsState &cs) {
cs.add_command("exec", "sb", [](CsState &cs, char *file, int *msg) {
bool ret = cs.run_file(file);
if (!ret) {
@ -3546,7 +3546,7 @@ void init_lib_io(CsState &cs) {
void cs_init_lib_base_loops(CsState &cs);
void init_lib_base(CsState &cs) {
static void cs_init_lib_base(CsState &cs) {
cs.add_command("do", "e", [](CsState &cs, ostd::Uint32 *body) {
cs.run_ret(body);
}, ID_DO);
@ -4005,7 +4005,7 @@ int cs_list_includes(const char *list, ostd::ConstCharRange needle) {
static void cs_init_lib_list_sort(CsState &cs);
void init_lib_list(CsState &cs) {
static void cs_init_lib_list(CsState &cs) {
cs.add_command("listlen", "s", [](CsState &cs, char *s) {
cs.result->set_int(int(util::list_length(s)));
});
@ -4489,7 +4489,7 @@ static void cs_init_lib_list_sort(CsState &cs) {
static constexpr float PI = 3.14159265358979f;
static constexpr float RAD = PI / 180.0f;
void init_lib_math(CsState &cs) {
static void cs_init_lib_math(CsState &cs) {
cs.add_command("sin", "f", [](CsState &cs, float *a) {
cs.result->set_float(sin(*a * RAD));
});
@ -4676,7 +4676,7 @@ void init_lib_math(CsState &cs) {
#undef CS_CMD_CMP
}
void init_lib_string(CsState &cs) {
static void cs_init_lib_string(CsState &cs) {
cs.add_command("strstr", "ss", [](CsState &cs, char *a, char *b) {
char *s = strstr(a, b);
cs.result->set_int(s ? (s - a) : -1);
@ -4852,4 +4852,12 @@ void init_lib_string(CsState &cs) {
});
}
void init_libs(CsState &cs, int libs) {
if (libs & CS_LIB_BASE ) cs_init_lib_base(cs);
if (libs & CS_LIB_IO ) cs_init_lib_io(cs);
if (libs & CS_LIB_MATH ) cs_init_lib_math(cs);
if (libs & CS_LIB_STRING) cs_init_lib_string(cs);
if (libs & CS_LIB_LIST ) cs_init_lib_list(cs);
}
} /* namespace cscript */

15
cubescript.hh
View File

@ -483,11 +483,16 @@ struct CsState {
ostd::Uint32 *compile(ostd::ConstCharRange code);
};
void init_lib_base(CsState &cs);
void init_lib_io(CsState &cs);
void init_lib_math(CsState &cs);
void init_lib_string(CsState &cs);
void init_lib_list(CsState &cs);
enum {
CS_LIB_BASE = 1 << 0,
CS_LIB_IO = 1 << 1,
CS_LIB_MATH = 1 << 2,
CS_LIB_STRING = 1 << 3,
CS_LIB_LIST = 1 << 4,
CS_LIB_ALL = 0b11111
};
void init_libs(CsState &cs, int libs = CS_LIB_ALL);
inline bool check_alias(Ident *id) {
return id && (id->type == ID_ALIAS);