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

use TvalRange for concat-commandn

master
Daniel Kolesa 2016-08-01 00:31:17 +01:00
parent 49e09a117e
commit a32b2b970a
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cubescript.cc
View File

@ -2651,7 +2651,14 @@ static inline void callcommand(CsState &cs, Ident *id, TaggedValue *args, int nu
case 'C': {
i = ostd::max(i + 1, numargs);
ostd::Vector<char> buf;
id->cb_cfs(cs, conc(buf, ostd::iter(args, i), true));
char *str = conc(buf, ostd::iter(args, i), true);
if (id->flags & IDF_NOEXPAND) {
TaggedValue tv;
tv.set_mstr(str);
id->cb_cftv(cs, TvalRange(&tv, 1));
} else {
id->cb_cfs(cs, str);
}
goto cleanup;
}
case 'V':
@ -3224,7 +3231,14 @@ static ostd::Uint32 const *runcode(CsState &cs, ostd::Uint32 const *code, Tagged
{
ostd::Vector<char> buf;
buf.reserve(256);
id->cb_cfs(cs, conc(buf, ostd::iter(&args[offset], callargs), true));
char *str = conc(buf, ostd::iter(&args[offset], callargs), true);
if (id->flags & IDF_NOEXPAND) {
TaggedValue tv;
tv.set_mstr(str);
id->cb_cftv(cs, TvalRange(&tv, 1));
} else {
id->cb_cfs(cs, str);
}
}
result.force(op & CODE_RET_MASK);
free_args(args, numargs, offset);