JDBtracker
/
OctaBuild
forked from OctaForge/OctaBuild
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

explicitly pass CsState (prepare for later libcubescript)

master
Daniel Kolesa 2016-10-09 15:38:53 +02:00
parent eeb7872aec
commit a12bb3fbe2
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
main.cc
View File

@ -505,22 +505,22 @@ struct ObState: CsState {
} }
void rule_add( void rule_add(
ConstCharRange tgt, ConstCharRange dep, CsBytecode *body, CsState &cs, ConstCharRange tgt, ConstCharRange dep, CsBytecode *body,
bool action = false bool action = false
) { ) {
auto targets = cscript::util::list_explode(*this, tgt); auto targets = cscript::util::list_explode(cs, tgt);
for (auto &target: targets.iter()) { for (auto &target: targets.iter()) {
Rule &r = rules.push(); Rule &r = rules.push();
r.target = target; r.target = target;
r.action = action; r.action = action;
r.func = cscript::cs_code_is_empty(body) ? nullptr : body; r.func = cscript::cs_code_is_empty(body) ? nullptr : body;
r.deps = cscript::util::list_explode(*this, dep); r.deps = cscript::util::list_explode(cs, dep);
} }
} }
void rule_dup( void rule_dup(
ConstCharRange tgt, ConstCharRange ptgt, ConstCharRange dep, CsState &cs, ConstCharRange tgt, ConstCharRange ptgt,
bool inherit_deps ConstCharRange dep, bool inherit_deps
) { ) {
Rule *oldr = nullptr; Rule *oldr = nullptr;
for (auto &rule: rules.iter()) { for (auto &rule: rules.iter()) {
@ -539,36 +539,36 @@ struct ObState: CsState {
if (inherit_deps) { if (inherit_deps) {
r.deps = oldr->deps; r.deps = oldr->deps;
} else { } else {
r.deps = cscript::util::list_explode(*this, dep); r.deps = cscript::util::list_explode(cs, dep);
} }
} }
void register_rulecmds() { void register_rulecmds() {
new_command("rule", "sse", [this]( new_command("rule", "sse", [this](
CsState &, CsValueRange args, CsValue & CsState &cs, CsValueRange args, CsValue &
) { ) {
rule_add( rule_add(
args[0].get_strr(), args[1].get_strr(), args[2].get_code() cs, args[0].get_strr(), args[1].get_strr(), args[2].get_code()
); );
}); });
new_command("action", "se", [this]( new_command("action", "se", [this](
CsState &, CsValueRange args, CsValue & CsState &cs, CsValueRange args, CsValue &
) { ) {
rule_add(args[0].get_strr(), nullptr, args[1].get_code(), true); rule_add(cs, args[0].get_strr(), nullptr, args[1].get_code(), true);
}); });
new_command("depend", "ss", [this]( new_command("depend", "ss", [this](
CsState &, CsValueRange args, CsValue & CsState &cs, CsValueRange args, CsValue &
) { ) {
rule_add(args[0].get_strr(), args[1].get_strr(), nullptr); rule_add(cs, args[0].get_strr(), args[1].get_strr(), nullptr);
}); });
new_command("duprule", "sssN", [this]( new_command("duprule", "sssN", [this](
CsState &, CsValueRange args, CsValue & CsState &cs, CsValueRange args, CsValue &
) { ) {
rule_dup( rule_dup(
args[0].get_strr(), args[1].get_strr(), cs, args[0].get_strr(), args[1].get_strr(),
args[2].get_strr(), args[3].get_int() <= 2 args[2].get_strr(), args[3].get_int() <= 2
); );
}); });