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

make it easier to grep

master
Daniel Kolesa 2016-08-10 00:54:51 +01:00
parent b7ae0c500a
commit 96f8f2f7d0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cubescript.cc
View File

@ -164,7 +164,7 @@ Ident::Ident(int t, ostd::ConstCharRange n, TaggedValue const &v, int flagsv)
Ident::Ident(int t, ostd::ConstCharRange n, ostd::ConstCharRange args,
ostd::Uint32 argmask, int numargs, CmdFunc f, int flagsv)
: type(t), numargs(numargs), flags(flagsv), name(n),
args(!args.empty() ? cs_dup_ostr(args) : nullptr),
cargs(!args.empty() ? cs_dup_ostr(args) : nullptr),
argmask(argmask), cb_cftv(ostd::move(f)) {
}
@ -199,7 +199,7 @@ CsState::~CsState() {
delete[] reinterpret_cast<ostd::Uint32 *>(i.code);
i.code = nullptr;
} else if (i.type == ID_COMMAND || i.type >= ID_LOCAL) {
delete[] i.args;
delete[] i.cargs;
}
}
}
@ -1573,7 +1573,7 @@ lookupid:
case ID_COMMAND: {
int comtype = CODE_COM, numargs = 0;
if (prevargs >= MaxResults) gs.code.push(CODE_ENTER);
for (char const *fmt = id->args; *fmt; fmt++) switch (*fmt) {
for (char const *fmt = id->cargs; *fmt; fmt++) switch (*fmt) {
case 'S':
gs.gen_str();
numargs++;
@ -2096,7 +2096,7 @@ noid:
case ID_COMMAND: {
int comtype = CODE_COM, fakeargs = 0;
bool rep = false;
for (char const *fmt = id->args; *fmt; fmt++) switch (*fmt) {
for (char const *fmt = id->cargs; *fmt; fmt++) switch (*fmt) {
case 'S':
case 's':
if (more) more = compilearg(gs, *fmt == 's' ? VAL_CSTR : VAL_STR, prevargs + numargs);
@ -2506,7 +2506,7 @@ static ostd::Uint32 const *skipcode(ostd::Uint32 const *code, TaggedValue *resul
static inline void callcommand(CsState &cs, Ident *id, TaggedValue *args, int numargs, bool lookup = false) {
int i = -1, fakeargs = 0;
bool rep = false;
for (char const *fmt = id->args; *fmt; fmt++) switch (*fmt) {
for (char const *fmt = id->cargs; *fmt; fmt++) switch (*fmt) {
case 'i':
if (++i >= numargs) {
if (rep) break;

2
cubescript.hh
View File

@ -199,7 +199,7 @@ struct OSTD_EXPORT Ident {
IdentStack *stack;
};
struct { /* ID_COMMAND */
char *args;
char *cargs;
ostd::Uint32 argmask;
};
};