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

expand run_file api

master
Daniel Kolesa 2016-08-18 19:34:24 +01:00
parent 8418b8bb9e
commit 84f2cb16e0
2 changed files with 89 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
cs_vm.cc
View File

@ -1754,8 +1754,28 @@ bool CsState::run_bool(Ident *id, TvalRange args) {
return b;
}
bool CsState::run_file(ostd::ConstCharRange fname) {
ostd::ConstCharRange oldsrcfile = src_file, oldsrcstr = src_str;
void CsState::run(Bytecode const *code) {
TaggedValue ret;
run_ret(code, ret);
ret.cleanup();
}
void CsState::run(ostd::ConstCharRange code) {
TaggedValue ret;
run_ret(code, ret);
ret.cleanup();
}
void CsState::run(Ident *id, TvalRange args) {
TaggedValue ret;
run_ret(id, args, ret);
ret.cleanup();
}
static bool cs_run_file(
CsState &cs, ostd::ConstCharRange fname, TaggedValue &ret
) {
ostd::ConstCharRange oldsrcfile = cs.src_file, oldsrcstr = cs.src_str;
ostd::Box<char[]> buf;
ostd::Size len;
@ -1771,11 +1791,64 @@ bool CsState::run_file(ostd::ConstCharRange fname) {
}
buf[len] = '\0';
src_file = fname;
src_str = ostd::ConstCharRange(buf.get(), len);
run_int(src_str);
src_file = oldsrcfile;
src_str = oldsrcstr;
cs.src_file = fname;
cs.src_str = ostd::ConstCharRange(buf.get(), len);
cs.run_ret(cs.src_str, ret);
cs.src_file = oldsrcfile;
cs.src_str = oldsrcstr;
return true;
}
ostd::Maybe<ostd::String> CsState::run_file_str(ostd::ConstCharRange fname) {
TaggedValue ret;
if (!cs_run_file(*this, fname, ret)) {
return ostd::nothing;
}
ostd::String s = ret.get_str();
ret.cleanup();
return ostd::move(s);
}
ostd::Maybe<CsInt> CsState::run_file_int(ostd::ConstCharRange fname) {
TaggedValue ret;
if (!cs_run_file(*this, fname, ret)) {
return ostd::nothing;
}
CsInt i = ret.get_int();
ret.cleanup();
return i;
}
ostd::Maybe<CsFloat> CsState::run_file_float(ostd::ConstCharRange fname) {
TaggedValue ret;
if (!cs_run_file(*this, fname, ret)) {
return ostd::nothing;
}
CsFloat f = ret.get_float();
ret.cleanup();
return f;
}
ostd::Maybe<bool> CsState::run_file_bool(ostd::ConstCharRange fname) {
TaggedValue ret;
if (!cs_run_file(*this, fname, ret)) {
return ostd::nothing;
}
bool i = ret.get_bool();
ret.cleanup();
return i;
}
bool CsState::run_file_ret(ostd::ConstCharRange fname, TaggedValue &ret) {
return cs_run_file(*this, fname, ret);
}
bool CsState::run_file(ostd::ConstCharRange fname) {
TaggedValue ret;
if (!cs_run_file(*this, fname, ret)) {
return false;
}
ret.cleanup();
return true;
}

9
cubescript.hh
View File

@ -415,6 +415,15 @@ struct OSTD_EXPORT CsState {
void run_ret(ostd::ConstCharRange code, TaggedValue &ret);
void run_ret(Ident *id, TvalRange args, TaggedValue &ret);
void run(Bytecode const *code);
void run(ostd::ConstCharRange code);
void run(Ident *id, TvalRange args);
ostd::Maybe<ostd::String> run_file_str(ostd::ConstCharRange fname);
ostd::Maybe<CsInt> run_file_int(ostd::ConstCharRange fname);
ostd::Maybe<CsFloat> run_file_float(ostd::ConstCharRange fname);
ostd::Maybe<bool> run_file_bool(ostd::ConstCharRange fname);
bool run_file_ret(ostd::ConstCharRange fname, TaggedValue &ret);
bool run_file(ostd::ConstCharRange fname);
void set_alias(ostd::ConstCharRange name, TaggedValue &v);