aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/algorithm.cxx4
-rw-r--r--build/cxx/rule4
-rw-r--r--build/cxx/rule.cxx6
-rw-r--r--build/rule6
-rw-r--r--build/rule.cxx4
5 files changed, 12 insertions, 12 deletions
diff --git a/build/algorithm.cxx b/build/algorithm.cxx
index 5026782..ddf0071 100644
--- a/build/algorithm.cxx
+++ b/build/algorithm.cxx
@@ -116,11 +116,11 @@ namespace build
make_exception_guard (
[](target& t, const string& n)
{
- info << "while selecting rule " << n << " for target " << t;
+ info << "while applying rule " << n << " for target " << t;
},
t, n));
- t.recipe (ru.select (t, m));
+ t.recipe (ru.apply (t, m));
break;
}
else
diff --git a/build/cxx/rule b/build/cxx/rule
index cf9ee51..80a917e 100644
--- a/build/cxx/rule
+++ b/build/cxx/rule
@@ -26,7 +26,7 @@ namespace build
match (target&, const std::string& hint) const;
virtual recipe
- select (target&, void*) const;
+ apply (target&, void*) const;
static target_state
update (target&);
@@ -43,7 +43,7 @@ namespace build
match (target&, const std::string& hint) const;
virtual recipe
- select (target&, void*) const;
+ apply (target&, void*) const;
static target_state
update (target&);
diff --git a/build/cxx/rule.cxx b/build/cxx/rule.cxx
index b355542..94433b9 100644
--- a/build/cxx/rule.cxx
+++ b/build/cxx/rule.cxx
@@ -57,7 +57,7 @@ namespace build
}
recipe compile::
- select (target& t, void* v) const
+ apply (target& t, void* v) const
{
// Derive object file name from target name.
//
@@ -371,9 +371,9 @@ namespace build
}
recipe link::
- select (target& t, void*) const
+ apply (target& t, void*) const
{
- tracer trace ("cxx::link::select");
+ tracer trace ("cxx::link::apply");
// Derive executable file name from target name.
//
diff --git a/build/rule b/build/rule
index 378ed9b..889c94c 100644
--- a/build/rule
+++ b/build/rule
@@ -22,7 +22,7 @@ namespace build
match (target&, const std::string& hint) const = 0;
virtual recipe
- select (target&, void*) const = 0;
+ apply (target&, void*) const = 0;
};
typedef std::unordered_map<
@@ -40,7 +40,7 @@ namespace build
match (target&, const std::string& hint) const;
virtual recipe
- select (target&, void*) const;
+ apply (target&, void*) const;
static target_state
update (target&);
@@ -53,7 +53,7 @@ namespace build
match (target&, const std::string& hint) const;
virtual recipe
- select (target&, void*) const;
+ apply (target&, void*) const;
static target_state
update (target&);
diff --git a/build/rule.cxx b/build/rule.cxx
index 2373033..dcb6df1 100644
--- a/build/rule.cxx
+++ b/build/rule.cxx
@@ -52,7 +52,7 @@ namespace build
}
recipe path_rule::
- select (target& t, void*) const
+ apply (target& t, void*) const
{
// Search and match all the prerequisites.
//
@@ -107,7 +107,7 @@ namespace build
}
recipe dir_rule::
- select (target& t, void*) const
+ apply (target& t, void*) const
{
search_and_match (t);
return &update;