Rework meta/operation registration

We now have global tables for meta/operation. Plus each can
then be enabled on the per-project basis.

1 files changed, 7 insertions, 9 deletions

diff --git a/build/file.cxx b/build/file.cxx
index 305c13a..e5deecf 100644
--- a/build/file.cxx
+++ b/build/file.cxx
@@ -118,19 +118,17 @@ namespace build
   {
     scope& rs (scopes.insert (out_root, true).first);
 
-    // Enter built-in meta-operation and operation names. Note that
-    // the order of registration should match the id constants; see
-    // <operation> for details. Loading of modules (via the src
-    // bootstrap; see below) can result in additional names being
-    // added.
+    // Enter built-in meta-operation and operation names. Loading of
+    // modules (via the src bootstrap; see below) can result in
+    // additional meta/operations being added.
     //
     if (rs.meta_operations.empty ())
     {
-      assert (rs.meta_operations.insert (perform) == perform_id);
+      rs.meta_operations.insert (perform_id, perform);
 
-      assert (rs.operations.insert (default_) == default_id);
-      assert (rs.operations.insert (update) == update_id);
-      assert (rs.operations.insert (clean) == clean_id);
+      rs.operations.insert (default_id, default_);
+      rs.operations.insert (update_id, update);
+      rs.operations.insert (clean_id, clean);
     }
 
     // If this is already a root scope, verify that things are