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

saner default flags for new_ident

master
Daniel Kolesa 2015-08-13 19:51:15 +01:00
parent 0b1d83869f
commit b7995d4ee9
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cubescript.cc
View File

@ -143,7 +143,7 @@ CsState::CsState(): result(&no_ret) {
snprintf(buf, sizeof(buf), "arg%d", i + 1); snprintf(buf, sizeof(buf), "arg%d", i + 1);
new_ident((const char *)buf, IDF_ARG); new_ident((const char *)buf, IDF_ARG);
} }
dummy = new_ident("//dummy", IDF_UNKNOWN); dummy = new_ident("//dummy");
add_ident(ID_VAR, "numargs", MAX_ARGUMENTS, 0, &numargs); add_ident(ID_VAR, "numargs", MAX_ARGUMENTS, 0, &numargs);
add_ident(ID_VAR, "dbgalias", 0, 1000, &dbgalias); add_ident(ID_VAR, "dbgalias", 0, 1000, &dbgalias);
} }
@ -275,12 +275,12 @@ Ident *CsState::force_ident(TaggedValue &v) {
return v.id; return v.id;
case VAL_MACRO: case VAL_MACRO:
case VAL_CSTR: { case VAL_CSTR: {
Ident *id = new_ident(v.s, IDF_UNKNOWN); Ident *id = new_ident(v.s);
v.set_ident(id); v.set_ident(id);
return id; return id;
} }
case VAL_STR: { case VAL_STR: {
Ident *id = new_ident(v.s, IDF_UNKNOWN); Ident *id = new_ident(v.s);
delete[] v.s; delete[] v.s;
v.set_ident(id); v.set_ident(id);
return id; return id;
@ -1329,7 +1329,7 @@ struct GenState {
} }
void gen_ident(ostd::ConstCharRange word) { void gen_ident(ostd::ConstCharRange word) {
gen_ident(cs.new_ident(word, IDF_UNKNOWN)); gen_ident(cs.new_ident(word));
} }
void gen_value(int wordtype, ostd::ConstCharRange word void gen_value(int wordtype, ostd::ConstCharRange word
@ -1506,7 +1506,7 @@ static void compilelookup(GenState &gs, int ltype, int prevargs = MAX_RESULTS) {
cutword(gs.source, lookup); cutword(gs.source, lookup);
if (!lookup.size()) goto invalid; if (!lookup.size()) goto invalid;
lookupid: lookupid:
Ident *id = gs.cs.new_ident(lookup, IDF_UNKNOWN); Ident *id = gs.cs.new_ident(lookup);
if (id) switch (id->type) { if (id) switch (id->type) {
case ID_VAR: case ID_VAR:
gs.code.push(CODE_IVAR | cs_ret_code(ltype, RET_INT) | (id->index << 8)); gs.code.push(CODE_IVAR | cs_ret_code(ltype, RET_INT) | (id->index << 8));
@ -1765,7 +1765,7 @@ static bool compileblocksub(GenState &gs, int prevargs) {
lookup = ostd::ConstCharRange(op, gs.source - op); lookup = ostd::ConstCharRange(op, gs.source - op);
if (lookup.empty()) return false; if (lookup.empty()) return false;
lookupid: lookupid:
Ident *id = gs.cs.new_ident(lookup, IDF_UNKNOWN); Ident *id = gs.cs.new_ident(lookup);
if (id) switch (id->type) { if (id) switch (id->type) {
case ID_VAR: case ID_VAR:
gs.code.push(CODE_IVAR | (id->index << 8)); gs.code.push(CODE_IVAR | (id->index << 8));
@ -2035,7 +2035,7 @@ static void compilestatements(GenState &gs, int rettype, int brak, int prevargs)
case '\0': case '\0':
gs.next_char(); gs.next_char();
if (idname.data()) { if (idname.data()) {
Ident *id = gs.cs.new_ident(idname, IDF_UNKNOWN); Ident *id = gs.cs.new_ident(idname);
if (id) switch (id->type) { if (id) switch (id->type) {
case ID_ALIAS: case ID_ALIAS:
if (!(more = compilearg(gs, VAL_ANY, prevargs))) gs.gen_str(); if (!(more = compilearg(gs, VAL_ANY, prevargs))) gs.gen_str();
@ -2932,7 +2932,7 @@ static const ostd::Uint32 *runcode(CsState &cs, const ostd::Uint32 *code, Tagged
} }
case CODE_IDENTU: { case CODE_IDENTU: {
TaggedValue &arg = args[numargs - 1]; TaggedValue &arg = args[numargs - 1];
Ident *id = arg.type == VAL_STR || arg.type == VAL_MACRO || arg.type == VAL_CSTR ? cs.new_ident(arg.cstr, IDF_UNKNOWN) : cs.dummy; Ident *id = arg.type == VAL_STR || arg.type == VAL_MACRO || arg.type == VAL_CSTR ? cs.new_ident(arg.cstr) : cs.dummy;
if (id->index < MAX_ARGUMENTS && !(cs.stack->usedargs & (1 << id->index))) { if (id->index < MAX_ARGUMENTS && !(cs.stack->usedargs & (1 << id->index))) {
id->push_arg(null_value, cs.stack->argstack[id->index], false); id->push_arg(null_value, cs.stack->argstack[id->index], false);
cs.stack->usedargs |= 1 << id->index; cs.stack->usedargs |= 1 << id->index;

3
cubescript.hh
View File

@ -310,7 +310,7 @@ struct CsState {
return identmap.push(&def); return identmap.push(&def);
} }
Ident *new_ident(ostd::ConstCharRange name, int flags = 0); Ident *new_ident(ostd::ConstCharRange name, int flags = IDF_UNKNOWN);
Ident *force_ident(TaggedValue &v); Ident *force_ident(TaggedValue &v);
Ident *get_ident(ostd::ConstCharRange name) { Ident *get_ident(ostd::ConstCharRange name) {
@ -436,7 +436,6 @@ struct StackedValue: TaggedValue {
} }
bool pop() { bool pop() {
printf("pop\n");
if (!pushed || !id) return false; if (!pushed || !id) return false;
id->pop_arg(); id->pop_arg();
pushed = false; pushed = false;