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

formatting

master
Daniel Kolesa 2015-10-02 19:25:08 +01:00
parent 9199b76648
commit 86c0d6b635
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
main.cc
View File

@ -105,7 +105,8 @@ static bool ob_check_file(ConstCharRange fname) {
return ostd::FileStream(fname, ostd::StreamMode::read).is_open(); return ostd::FileStream(fname, ostd::StreamMode::read).is_open();
} }
static bool ob_check_exec(ConstCharRange tname, const Vector<String> &deps) { static bool ob_check_exec(ConstCharRange tname,
const Vector<String> &deps) {
if (!ob_check_file(tname)) if (!ob_check_file(tname))
return true; return true;
for (auto &dep: deps.iter()) for (auto &dep: deps.iter())
@ -137,7 +138,8 @@ static ConstCharRange ob_compare_subst(ConstCharRange expanded,
/* part after % does not compare, so ignore */ /* part after % does not compare, so ignore */
if (expanded.size() <= rep.size()) if (expanded.size() <= rep.size())
return nullptr; return nullptr;
if (expanded.slice(expanded.size() - rep.size(), expanded.size()) != rep) ostd::Size es = expanded.size();
if (expanded.slice(es - rep.size(), es) != rep)
return nullptr; return nullptr;
/* cut off latter part */ /* cut off latter part */
expanded.pop_back_n(rep.size()); expanded.pop_back_n(rep.size());
@ -165,21 +167,22 @@ struct ObState {
int exec_list(const Vector<SubRule> &rlist, Vector<String> &subdeps, int exec_list(const Vector<SubRule> &rlist, Vector<String> &subdeps,
ConstCharRange tname) { ConstCharRange tname) {
String repd; String repd;
for (auto &sr: rlist.iter()) for (auto &target: sr.rule->deps.iter()) { for (auto &sr: rlist.iter())
ConstCharRange atgt = target.iter(); for (auto &target: sr.rule->deps.iter()) {
repd.clear(); ConstCharRange atgt = target.iter();
auto lp = ostd::find(atgt, '%'); repd.clear();
if (!lp.empty()) { auto lp = ostd::find(atgt, '%');
repd.append(slice_until(atgt, lp)); if (!lp.empty()) {
repd.append(sr.sub); repd.append(slice_until(atgt, lp));
lp.pop_front(); repd.append(sr.sub);
if (!lp.empty()) repd.append(lp); lp.pop_front();
atgt = repd.iter(); if (!lp.empty()) repd.append(lp);
atgt = repd.iter();
}
subdeps.push(atgt);
int r = exec_rule(atgt, tname);
if (r) return r;
} }
subdeps.push(atgt);
int r = exec_rule(atgt, tname);
if (r) return r;
}
return 0; return 0;
} }
@ -225,7 +228,8 @@ struct ObState {
auto dsv = ostd::appender<String>(); auto dsv = ostd::appender<String>();
ostd::concat(dsv, subdeps); ostd::concat(dsv, subdeps);
ostd::Size len = dsv.size(); ostd::Size len = dsv.size();
sourcesv.set_str(ostd::CharRange(dsv.get().disown(), len)); sourcesv.set_str(ostd::CharRange(dsv.get().disown(),
len));
sourcesv.push(); sourcesv.push();
} }
@ -330,7 +334,8 @@ int main(int argc, char **argv) {
tpool.init(os.jobs); tpool.init(os.jobs);
os.cs.add_command("shell", "C", [](cscript::CsState &cs, ConstCharRange s) { os.cs.add_command("shell", "C", [](cscript::CsState &cs,
ConstCharRange s) {
RuleCounter *cnt = counters.back(); RuleCounter *cnt = counters.back();
cnt->incr(); cnt->incr();
char *ds = String(s).disown(); char *ds = String(s).disown();
@ -361,7 +366,8 @@ int main(int argc, char **argv) {
} }
}); });
os.cs.add_command("getenv", "s", [](cscript::CsState &cs, const char *en) { os.cs.add_command("getenv", "s", [](cscript::CsState &cs,
const char *en) {
if (ignore_env) { if (ignore_env) {
cs.result->set_cstr(""); cs.result->set_cstr("");
return; return;