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

api update

master
Daniel Kolesa 2016-08-28 18:41:01 +01:00
parent 1ec5b0febb
commit 4c6b1f15af
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.cc
View File

@ -29,8 +29,8 @@ using cscript::CsState;
using cscript::CsValueRange; using cscript::CsValueRange;
using cscript::CsValue; using cscript::CsValue;
using cscript::StackedValue; using cscript::StackedValue;
using cscript::BytecodeRef; using cscript::CsBytecodeRef;
using cscript::Bytecode; using cscript::CsBytecode;
/* glob matching code */ /* glob matching code */
@ -280,7 +280,7 @@ struct ObState: CsState {
struct Rule { struct Rule {
String target; String target;
Vector<String> deps; Vector<String> deps;
BytecodeRef func; CsBytecodeRef func;
bool action; bool action;
Rule(): target(), deps(), func(), action(false) {} Rule(): target(), deps(), func(), action(false) {}
@ -386,7 +386,7 @@ struct ObState: CsState {
int ret = wait_result([&rlist, &subdeps, &tname, this]() { int ret = wait_result([&rlist, &subdeps, &tname, this]() {
return exec_list(rlist, subdeps, tname); return exec_list(rlist, subdeps, tname);
}); });
BytecodeRef *func = nullptr; CsBytecodeRef *func = nullptr;
bool act = false; bool act = false;
for (auto &sr: rlist.iter()) { for (auto &sr: rlist.iter()) {
if (sr.rule->func) { if (sr.rule->func) {
@ -505,7 +505,7 @@ struct ObState: CsState {
} }
void rule_add( void rule_add(
ConstCharRange tgt, ConstCharRange dep, Bytecode *body, ConstCharRange tgt, ConstCharRange dep, CsBytecode *body,
bool action = false bool action = false
) { ) {
auto targets = cscript::util::list_explode(tgt); auto targets = cscript::util::list_explode(tgt);