aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-05-10 12:52:12 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-05-10 12:52:12 +0200
commite415977b23ea95a833ce1967dac9f8e7fe255334 (patch)
tree804880f8b14921384bed197e687b9b5ae90850b9
parent2b1272f1c94ab1dbaf806af9c02ef866267ffed7 (diff)
Minor cleanups and clarifications
-rw-r--r--build2/algorithm.cxx2
-rw-r--r--build2/algorithm.hxx3
-rw-r--r--build2/algorithm.ixx5
-rw-r--r--build2/cc/link-rule.cxx10
-rw-r--r--build2/target.hxx2
-rw-r--r--build2/target.ixx2
6 files changed, 13 insertions, 11 deletions
diff --git a/build2/algorithm.cxx b/build2/algorithm.cxx
index fc72d74..cb38905 100644
--- a/build2/algorithm.cxx
+++ b/build2/algorithm.cxx
@@ -1487,7 +1487,7 @@ namespace build2
// requirement: if we are delegating to the group, we need to find a
// recipe for it, just like we would for a prerequisite.
//
- // Note that below we are going to treat the group state to postponed.
+ // Note that we are also going to treat the group state as postponed.
// This is not a mistake: until we execute the recipe, we want to keep
// returning postponed. And once the recipe is executed, it will reset the
// state to group (see group_action()). To put it another way, the
diff --git a/build2/algorithm.hxx b/build2/algorithm.hxx
index f1ac135..5f0854f 100644
--- a/build2/algorithm.hxx
+++ b/build2/algorithm.hxx
@@ -266,7 +266,8 @@ namespace build2
size_t start_count, atomic_count& task_count,
bool fail = true);
- // Match by specifying the recipe directly. The target must be locked.
+ // Match by specifying the recipe directly and without incrementing the
+ // dependency counts. The target must be locked.
//
void
match_recipe (target_lock&, recipe);
diff --git a/build2/algorithm.ixx b/build2/algorithm.ixx
index 0b3a23e..a01ee58 100644
--- a/build2/algorithm.ixx
+++ b/build2/algorithm.ixx
@@ -376,9 +376,8 @@ namespace build2
// This gets tricky when we start considering direct execution, etc. So
// here seems like the best place to do it.
//
- // We also ignore the group recipe since it is used for ad hoc groups
- // (which are not executed). Plus, group action means real recipe is in
- // the group so this also feels right conceptually.
+ // We also ignore the group recipe since group action means real recipe
+ // is in the group and so this feels right conceptually.
//
// We also avoid incrementing this count twice for the same target if we
// have both the inner and outer operations. In our model the outer
diff --git a/build2/cc/link-rule.cxx b/build2/cc/link-rule.cxx
index f3fbaad..b873e40 100644
--- a/build2/cc/link-rule.cxx
+++ b/build2/cc/link-rule.cxx
@@ -74,7 +74,7 @@ namespace build2
// that X could be C (as in language). We handle this by always checking
// for X first.
//
- // Note also that we treat bmi{} as obj{}.
+ // Note also that we treat bmi{} as obj{}. @@ MODHDR hbmi{}?
//
bool seen_x (false), seen_c (false), seen_obj (false), seen_lib (false);
@@ -576,6 +576,8 @@ namespace build2
continue;
}
+ // @@ MODHDR: hbmix{} has no objx{}
+ //
binless = binless && !(pt->is_a<objx> () || pt->is_a<bmix> ());
m = 3;
@@ -1260,7 +1262,7 @@ namespace build2
if (modules)
{
- if (pt->is_a<bmix> ())
+ if (pt->is_a<bmix> ()) // @@ MODHDR: hbmix{} has no objx{}
pt = pt->member;
}
@@ -2053,7 +2055,7 @@ namespace build2
//
if (modules)
{
- if (pt->is_a<bmix> ())
+ if (pt->is_a<bmix> ()) // @@ MODHDR: hbmix{} has no objx{}
pt = pt->member;
}
@@ -2360,7 +2362,7 @@ namespace build2
if (modules)
{
- if (pt->is_a<bmix> ())
+ if (pt->is_a<bmix> ()) // @@ MODHDR: hbmix{} has no objx{}
pt = pt->member;
}
diff --git a/build2/target.hxx b/build2/target.hxx
index a86a8be..e167211 100644
--- a/build2/target.hxx
+++ b/build2/target.hxx
@@ -619,7 +619,7 @@ namespace build2
// matched.
//
bool
- group_state (action a) const;
+ group_state (action) const;
public:
// Targets to which prerequisites resolve for this action. Note that
diff --git a/build2/target.ixx b/build2/target.ixx
index dcbea32..a2be81c 100644
--- a/build2/target.ixx
+++ b/build2/target.ixx
@@ -98,7 +98,7 @@ namespace build2
{
// We go an extra step and short-circuit to the target state even if the
// raw state is not group provided the recipe is group_recipe and the
- // state is unknown (see mtime() for some ideas on why we do it).
+ // state is unknown (see mtime() for a discussion on why we do it).
//
const opstate& s (state[a]);