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

move some funcs around

master
Daniel Kolesa 2016-08-12 18:31:34 +01:00
parent 0122971aab
commit 8f8abd9bc1
3 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
cs_vm.cc
View File

@ -5,8 +5,27 @@
namespace cscript {
ostd::Uint32 const *forcecode(CsState &cs, TaggedValue &v);
void forcecond(CsState &cs, TaggedValue &v);
static inline ostd::Uint32 const *forcecode(CsState &cs, TaggedValue &v) {
if (v.get_type() != VAL_CODE) {
GenState gs(cs);
gs.code.reserve(64);
gs.gen_main(v.get_str());
v.cleanup();
v.set_code(reinterpret_cast<Bytecode *>(gs.code.disown() + 1));
}
return reinterpret_cast<ostd::Uint32 const *>(v.code);
}
static inline void forcecond(CsState &cs, TaggedValue &v) {
switch (v.get_type()) {
case VAL_STR:
case VAL_MACRO:
case VAL_CSTR:
if (v.s[0]) forcecode(cs, v);
else v.set_int(0);
break;
}
}
static ostd::Uint32 emptyblock[VAL_ANY][2] = {
{ CODE_START + 0x100, CODE_EXIT | RET_NULL },

4
cs_vm.hh
View File

@ -203,10 +203,6 @@ struct GenState {
}
};
void cs_set_macro(
TaggedValue &tv, Bytecode const *val, ostd::Size len
);
int parseint(char const *s);
float parsefloat(char const *s);

26
cubescript.cc
View File

@ -2115,29 +2115,7 @@ ostd::Uint32 *compilecode(CsState &cs, ostd::ConstCharRange str) {
return code;
}
ostd::Uint32 const *forcecode(CsState &cs, TaggedValue &v) {
if (v.get_type() != VAL_CODE) {
GenState gs(cs);
gs.code.reserve(64);
gs.gen_main(v.get_str());
v.cleanup();
v.set_code(reinterpret_cast<Bytecode *>(gs.code.disown() + 1));
}
return reinterpret_cast<ostd::Uint32 const *>(v.code);
}
void forcecond(CsState &cs, TaggedValue &v) {
switch (v.get_type()) {
case VAL_STR:
case VAL_MACRO:
case VAL_CSTR:
if (v.s[0]) forcecode(cs, v);
else v.set_int(0);
break;
}
}
void bcode_ref(ostd::Uint32 *code) {
static void bcode_ref(ostd::Uint32 *code) {
if (!code) return;
switch (*code & CODE_OP_MASK) {
case CODE_START:
@ -2155,7 +2133,7 @@ void bcode_ref(ostd::Uint32 *code) {
}
}
void bcode_unref(ostd::Uint32 *code) {
static void bcode_unref(ostd::Uint32 *code) {
if (!code) return;
switch (*code & CODE_OP_MASK) {
case CODE_START: