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

add set_str_dup method to TaggedValue which will automatically duplicate memory

master
Daniel Kolesa 2015-08-13 22:55:30 +01:00
parent 4712c45847
commit bc6a85d49c
2 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
cubescript.cc
View File

@ -459,8 +459,7 @@ inline ostd::ConstCharRange TaggedValue::force_str() {
return s; return s;
} }
cleanup(); cleanup();
ostd::ConstCharRange cs(rs); set_str_dup(rs);
set_str(ostd::CharRange(cs_dup_ostr(cs), cs.size()));
return s; return s;
} }
@ -549,7 +548,7 @@ static inline void cs_get_val(const IdentValue &v, int type, int len, TaggedValu
case VAL_STR: case VAL_STR:
case VAL_MACRO: case VAL_MACRO:
case VAL_CSTR: { case VAL_CSTR: {
r.set_str(ostd::CharRange(cs_dup_ostr(v.s), len)); r.set_str_dup(ostd::ConstCharRange(v.s, len));
break; break;
} }
case VAL_INT: case VAL_INT:
@ -573,7 +572,6 @@ inline void Ident::get_val(TaggedValue &r) const {
} }
inline void Ident::get_cstr(TaggedValue &v) const { inline void Ident::get_cstr(TaggedValue &v) const {
ostd::ConstCharRange cs;
switch (get_valtype()) { switch (get_valtype()) {
case VAL_MACRO: case VAL_MACRO:
v.set_macro(val.code); v.set_macro(val.code);
@ -583,12 +581,10 @@ inline void Ident::get_cstr(TaggedValue &v) const {
v.set_cstr(ostd::ConstCharRange(val.s, valtype >> 4)); v.set_cstr(ostd::ConstCharRange(val.s, valtype >> 4));
break; break;
case VAL_INT: case VAL_INT:
cs = intstr(val.i); v.set_str_dup(intstr(val.i));
v.set_str(ostd::CharRange(cs_dup_ostr(cs), cs.size()));
break; break;
case VAL_FLOAT: case VAL_FLOAT:
cs = floatstr(val.f); v.set_str_dup(floatstr(val.f));
v.set_str(ostd::CharRange(cs_dup_ostr(cs), cs.size()));
break; break;
default: default:
v.set_cstr(""); v.set_cstr("");
@ -1035,8 +1031,7 @@ static void cs_init_lib_base_var(CsState &cs) {
}); });
cs.add_command("getalias", "s", [](CsState &cs, const char *name) { cs.add_command("getalias", "s", [](CsState &cs, const char *name) {
auto r = cs.get_alias(name).value_or(""); cs.result->set_str_dup(cs.get_alias(name).value_or(""));
cs.result->set_str(ostd::CharRange(cs_dup_ostr(r), r.size()));
}); });
} }
@ -2530,7 +2525,7 @@ static inline void callcommand(CsState &cs, Ident *id, TaggedValue *args, int nu
case 'S': case 'S':
if (++i >= numargs) { if (++i >= numargs) {
if (rep) break; if (rep) break;
args[i].set_str(cs_dup_ostr("")); args[i].set_str_dup("");
fakeargs++; fakeargs++;
} else args[i].force_str(); } else args[i].force_str();
break; break;
@ -2652,16 +2647,16 @@ static const ostd::Uint32 *runcode(CsState &cs, const ostd::Uint32 *code, Tagged
continue; continue;
RETOP(CODE_NULL | RET_NULL, result.set_null()) RETOP(CODE_NULL | RET_NULL, result.set_null())
RETOP(CODE_NULL | RET_STR, result.set_str(cs_dup_ostr(""))) RETOP(CODE_NULL | RET_STR, result.set_str_dup(""))
RETOP(CODE_NULL | RET_INT, result.set_int(0)) RETOP(CODE_NULL | RET_INT, result.set_int(0))
RETOP(CODE_NULL | RET_FLOAT, result.set_float(0.0f)) RETOP(CODE_NULL | RET_FLOAT, result.set_float(0.0f))
RETOP(CODE_FALSE | RET_STR, result.set_str(cs_dup_ostr("0"))) RETOP(CODE_FALSE | RET_STR, result.set_str_dup("0"))
case CODE_FALSE|RET_NULL: case CODE_FALSE|RET_NULL:
RETOP(CODE_FALSE | RET_INT, result.set_int(0)) RETOP(CODE_FALSE | RET_INT, result.set_int(0))
RETOP(CODE_FALSE | RET_FLOAT, result.set_float(0.0f)) RETOP(CODE_FALSE | RET_FLOAT, result.set_float(0.0f))
RETOP(CODE_TRUE | RET_STR, result.set_str(cs_dup_ostr("1"))) RETOP(CODE_TRUE | RET_STR, result.set_str_dup("1"))
case CODE_TRUE|RET_NULL: case CODE_TRUE|RET_NULL:
RETOP(CODE_TRUE | RET_INT, result.set_int(1)) RETOP(CODE_TRUE | RET_INT, result.set_int(1))
RETOP(CODE_TRUE | RET_FLOAT, result.set_float(1.0f)) RETOP(CODE_TRUE | RET_FLOAT, result.set_float(1.0f))
@ -2669,7 +2664,7 @@ static const ostd::Uint32 *runcode(CsState &cs, const ostd::Uint32 *code, Tagged
#define RETPOP(op, val) \ #define RETPOP(op, val) \
RETOP(op, { --numargs; val; args[numargs].cleanup(); }) RETOP(op, { --numargs; val; args[numargs].cleanup(); })
RETPOP(CODE_NOT | RET_STR, result.set_str(cs_dup_ostr(cs_get_bool(args[numargs]) ? "0" : "1"))) RETPOP(CODE_NOT | RET_STR, result.set_str_dup(cs_get_bool(args[numargs]) ? "0" : "1"))
case CODE_NOT|RET_NULL: case CODE_NOT|RET_NULL:
RETPOP(CODE_NOT | RET_INT, result.set_int(cs_get_bool(args[numargs]) ? 0 : 1)) RETPOP(CODE_NOT | RET_INT, result.set_int(cs_get_bool(args[numargs]) ? 0 : 1))
RETPOP(CODE_NOT | RET_FLOAT, result.set_float(cs_get_bool(args[numargs]) ? 0.0f : 1.0f)) RETPOP(CODE_NOT | RET_FLOAT, result.set_float(cs_get_bool(args[numargs]) ? 0.0f : 1.0f))
@ -2787,13 +2782,13 @@ static const ostd::Uint32 *runcode(CsState &cs, const ostd::Uint32 *code, Tagged
case CODE_VAL|RET_STR: { case CODE_VAL|RET_STR: {
ostd::Uint32 len = op >> 8; ostd::Uint32 len = op >> 8;
args[numargs++].set_str(ostd::CharRange(cs_dup_ostr(ostd::ConstCharRange((const char *)code, len)), len)); args[numargs++].set_str_dup(ostd::ConstCharRange((const char *)code, len));
code += len / sizeof(ostd::Uint32) + 1; code += len / sizeof(ostd::Uint32) + 1;
continue; continue;
} }
case CODE_VALI|RET_STR: { case CODE_VALI|RET_STR: {
char s[4] = { char((op >> 8) & 0xFF), char((op >> 16) & 0xFF), char((op >> 24) & 0xFF), '\0' }; char s[4] = { char((op >> 8) & 0xFF), char((op >> 16) & 0xFF), char((op >> 24) & 0xFF), '\0' };
args[numargs++].set_str(ostd::CharRange(cs_dup_ostr(s), 3)); args[numargs++].set_str_dup(s);
continue; continue;
} }
case CODE_VAL|RET_NULL: case CODE_VAL|RET_NULL:
@ -2825,12 +2820,10 @@ static const ostd::Uint32 *runcode(CsState &cs, const ostd::Uint32 *code, Tagged
args[numargs].set_float(args[numargs - 1].get_float()); args[numargs].set_float(args[numargs - 1].get_float());
numargs++; numargs++;
continue; continue;
case CODE_DUP|RET_STR: { case CODE_DUP|RET_STR:
ostd::ConstCharRange cr = args[numargs - 1].get_str(); args[numargs].set_str_dup(args[numargs - 1].get_str());
args[numargs].set_str(ostd::CharRange(cs_dup_ostr(cr), cr.size()));
numargs++; numargs++;
continue; continue;
}
case CODE_FORCE|RET_STR: case CODE_FORCE|RET_STR:
args[numargs - 1].force_str(); args[numargs - 1].force_str();
@ -2984,11 +2977,11 @@ static const ostd::Uint32 *runcode(CsState &cs, const ostd::Uint32 *code, Tagged
nval; \ nval; \
continue; \ continue; \
} }
LOOKUPU(arg.set_str(cs_dup_ostr(id->get_str())), LOOKUPU(arg.set_str_dup(id->get_str()),
arg.set_str(cs_dup_ostr(*id->storage.sp)), arg.set_str_dup(*id->storage.sp),
arg.set_str(cs_dup_ostr(intstr(*id->storage.ip))), arg.set_str_dup(intstr(*id->storage.ip)),
arg.set_str(cs_dup_ostr(floatstr(*id->storage.fp))), arg.set_str_dup(floatstr(*id->storage.fp)),
arg.set_str(cs_dup_ostr(""))); arg.set_str_dup(""));
case CODE_LOOKUP|RET_STR: case CODE_LOOKUP|RET_STR:
#define LOOKUP(aval) { \ #define LOOKUP(aval) { \
Ident *id = cs.identmap[op>>8]; \ Ident *id = cs.identmap[op>>8]; \
@ -2996,7 +2989,7 @@ static const ostd::Uint32 *runcode(CsState &cs, const ostd::Uint32 *code, Tagged
aval; \ aval; \
continue; \ continue; \
} }
LOOKUP(args[numargs++].set_str(cs_dup_ostr(id->get_str()))); LOOKUP(args[numargs++].set_str_dup(id->get_str()));
case CODE_LOOKUPARG|RET_STR: case CODE_LOOKUPARG|RET_STR:
#define LOOKUPARG(aval, nval) { \ #define LOOKUPARG(aval, nval) { \
Ident *id = cs.identmap[op>>8]; \ Ident *id = cs.identmap[op>>8]; \
@ -3004,7 +2997,7 @@ static const ostd::Uint32 *runcode(CsState &cs, const ostd::Uint32 *code, Tagged
aval; \ aval; \
continue; \ continue; \
} }
LOOKUPARG(args[numargs++].set_str(cs_dup_ostr(id->get_str())), args[numargs++].set_str(cs_dup_ostr(""))); LOOKUPARG(args[numargs++].set_str_dup(id->get_str()), args[numargs++].set_str_dup(""));
case CODE_LOOKUPU|RET_INT: case CODE_LOOKUPU|RET_INT:
LOOKUPU(arg.set_int(id->get_int()), LOOKUPU(arg.set_int(id->get_int()),
arg.set_int(parseint(*id->storage.sp)), arg.set_int(parseint(*id->storage.sp)),
@ -3027,7 +3020,7 @@ static const ostd::Uint32 *runcode(CsState &cs, const ostd::Uint32 *code, Tagged
LOOKUPARG(args[numargs++].set_float(id->get_float()), args[numargs++].set_float(0.0f)); LOOKUPARG(args[numargs++].set_float(id->get_float()), args[numargs++].set_float(0.0f));
case CODE_LOOKUPU|RET_NULL: case CODE_LOOKUPU|RET_NULL:
LOOKUPU(id->get_val(arg), LOOKUPU(id->get_val(arg),
arg.set_str(cs_dup_ostr(*id->storage.sp)), arg.set_str_dup(*id->storage.sp),
arg.set_int(*id->storage.ip), arg.set_int(*id->storage.ip),
arg.set_float(*id->storage.fp), arg.set_float(*id->storage.fp),
arg.set_null()); arg.set_null());
@ -3039,8 +3032,8 @@ static const ostd::Uint32 *runcode(CsState &cs, const ostd::Uint32 *code, Tagged
case CODE_LOOKUPMU|RET_STR: case CODE_LOOKUPMU|RET_STR:
LOOKUPU(id->get_cstr(arg), LOOKUPU(id->get_cstr(arg),
arg.set_cstr(*id->storage.sp), arg.set_cstr(*id->storage.sp),
arg.set_str(cs_dup_ostr(intstr(*id->storage.ip))), arg.set_str_dup(intstr(*id->storage.ip)),
arg.set_str(cs_dup_ostr(floatstr(*id->storage.fp))), arg.set_str_dup(floatstr(*id->storage.fp)),
arg.set_cstr("")); arg.set_cstr(""));
case CODE_LOOKUPM|RET_STR: case CODE_LOOKUPM|RET_STR:
LOOKUP(id->get_cstr(args[numargs++])); LOOKUP(id->get_cstr(args[numargs++]));
@ -3059,7 +3052,7 @@ static const ostd::Uint32 *runcode(CsState &cs, const ostd::Uint32 *code, Tagged
case CODE_SVAR|RET_STR: case CODE_SVAR|RET_STR:
case CODE_SVAR|RET_NULL: case CODE_SVAR|RET_NULL:
args[numargs++].set_str(cs_dup_ostr(*cs.identmap[op >> 8]->storage.sp)); args[numargs++].set_str_dup(*cs.identmap[op >> 8]->storage.sp);
continue; continue;
case CODE_SVAR|RET_INT: case CODE_SVAR|RET_INT:
args[numargs++].set_int(parseint(*cs.identmap[op >> 8]->storage.sp)); args[numargs++].set_int(parseint(*cs.identmap[op >> 8]->storage.sp));
@ -3080,7 +3073,7 @@ static const ostd::Uint32 *runcode(CsState &cs, const ostd::Uint32 *code, Tagged
args[numargs++].set_int(*cs.identmap[op >> 8]->storage.ip); args[numargs++].set_int(*cs.identmap[op >> 8]->storage.ip);
continue; continue;
case CODE_IVAR|RET_STR: case CODE_IVAR|RET_STR:
args[numargs++].set_str(cs_dup_ostr(intstr(*cs.identmap[op >> 8]->storage.ip))); args[numargs++].set_str_dup(intstr(*cs.identmap[op >> 8]->storage.ip));
continue; continue;
case CODE_IVAR|RET_FLOAT: case CODE_IVAR|RET_FLOAT:
args[numargs++].set_float(float(*cs.identmap[op >> 8]->storage.ip)); args[numargs++].set_float(float(*cs.identmap[op >> 8]->storage.ip));
@ -3102,7 +3095,7 @@ static const ostd::Uint32 *runcode(CsState &cs, const ostd::Uint32 *code, Tagged
args[numargs++].set_float(*cs.identmap[op >> 8]->storage.fp); args[numargs++].set_float(*cs.identmap[op >> 8]->storage.fp);
continue; continue;
case CODE_FVAR|RET_STR: case CODE_FVAR|RET_STR:
args[numargs++].set_str(cs_dup_ostr(floatstr(*cs.identmap[op >> 8]->storage.fp))); args[numargs++].set_str_dup(floatstr(*cs.identmap[op >> 8]->storage.fp));
continue; continue;
case CODE_FVAR|RET_INT: case CODE_FVAR|RET_INT:
args[numargs++].set_int(int(*cs.identmap[op >> 8]->storage.fp)); args[numargs++].set_int(int(*cs.identmap[op >> 8]->storage.fp));
@ -4038,7 +4031,7 @@ void init_lib_list(CsState &cs) {
if (len < 0) { if (len < 0) {
if (offset > 0) if (offset > 0)
p.skip(); p.skip();
cs.result->set_str(cs_dup_ostr(p.input)); cs.result->set_str_dup(p.input);
return; return;
} }
@ -4047,7 +4040,7 @@ void init_lib_list(CsState &cs) {
if (len > 0 && p.parse()) if (len > 0 && p.parse())
while (--len > 0 && p.parse()); while (--len > 0 && p.parse());
const char *qend = !p.quote.empty() ? &p.quote[p.quote.size()] : list; const char *qend = !p.quote.empty() ? &p.quote[p.quote.size()] : list;
cs.result->set_str(cs_dup_ostr(ostd::ConstCharRange(list, qend - list))); cs.result->set_str_dup(ostd::ConstCharRange(list, qend - list));
}); });
cs.add_command("listfind", "rse", [](CsState &cs, Ident *id, cs.add_command("listfind", "rse", [](CsState &cs, Ident *id,
@ -4777,10 +4770,10 @@ void init_lib_string(CsState &cs) {
cs.add_command("substr", "siiN", [](CsState &cs, char *s, int *start, cs.add_command("substr", "siiN", [](CsState &cs, char *s, int *start,
int *count, int *numargs) { int *count, int *numargs) {
int len = strlen(s), offset = ostd::clamp(*start, 0, len); int len = strlen(s), offset = ostd::clamp(*start, 0, len);
cs.result->set_str(cs_dup_ostr(ostd::ConstCharRange( cs.result->set_str_dup(ostd::ConstCharRange(
&s[offset], &s[offset],
(*numargs >= 3) ? ostd::clamp(*count, 0, len - offset) (*numargs >= 3) ? ostd::clamp(*count, 0, len - offset)
: (len - offset)))); : (len - offset)));
}); });
#define CS_CMD_CMPS(name, op) \ #define CS_CMD_CMPS(name, op) \
@ -4814,7 +4807,7 @@ void init_lib_string(CsState &cs) {
ostd::Vector<char> buf; ostd::Vector<char> buf;
int oldlen = strlen(oldval); int oldlen = strlen(oldval);
if (!oldlen) { if (!oldlen) {
cs.result->set_str(cs_dup_ostr(s)); cs.result->set_str_dup(s);
return; return;
} }
for (int i = 0;; ++i) { for (int i = 0;; ++i) {

6
cubescript.hh
View File

@ -112,6 +112,12 @@ struct TaggedValue: IdentValue {
p_type = VAL_STR | (val.size() << 4); p_type = VAL_STR | (val.size() << 4);
s = val.data(); s = val.data();
} }
void set_str_dup(ostd::ConstCharRange val) {
s = new char[val.size() + 1];
memcpy(s, val.data(), val.size());
s[val.size()] = '\0';
p_type = VAL_STR | (val.size() << 4);
}
void set_null() { void set_null() {
p_type = VAL_NULL; p_type = VAL_NULL;
i = 0; i = 0;