Move bunch of root scope-only data members to root_extra

3 files changed, 12 insertions, 10 deletions

diff --git a/build2/config/init.cxx b/build2/config/init.cxx
index 9dc3a3c..9c50335 100644
--- a/build2/config/init.cxx
+++ b/build2/config/init.cxx
@@ -52,8 +52,8 @@ namespace build2
       // Register meta-operations. Note that we don't register create_id
       // since it will be pre-processed into configure.
       //
-      rs.meta_operations.insert (configure_id, mo_configure);
-      rs.meta_operations.insert (disfigure_id, mo_disfigure);
+      rs.insert_meta_operation (configure_id, mo_configure);
+      rs.insert_meta_operation (disfigure_id, mo_disfigure);
 
       return true; // Initialize first (load config.build).
     }
diff --git a/build2/config/operation.cxx b/build2/config/operation.cxx
index 1064ebb..724b92d 100644
--- a/build2/config/operation.cxx
+++ b/build2/config/operation.cxx
@@ -95,7 +95,7 @@ namespace build2
       if (verb)
         text << (verb >= 2 ? "cat >" : "save ") << f;
 
-      const module& mod (*root.modules.lookup<const module> (module::name));
+      const module& mod (*root.lookup_module<const module> (module::name));
 
       try
       {
@@ -169,7 +169,7 @@ namespace build2
                 {
                   // Find the config module.
                   //
-                  if (auto* m = r->modules.lookup<const module> (module::name))
+                  if (auto* m = r->lookup_module<const module> (module::name))
                   {
                     // Find the corresponding saved module.
                     //
@@ -539,11 +539,13 @@ namespace build2
         if (rs == nullptr)
           fail << "out of project target " << t;
 
-        for (operation_id id (default_id + 1); // Skip default_id
-             id < rs->operations.size ();
+        const operations& ops (rs->root_extra->operations);
+
+        for (operation_id id (default_id + 1); // Skip default_id.
+             id < ops.size ();
              ++id)
         {
-          if (const operation_info* oif = rs->operations[id])
+          if (const operation_info* oif = ops[id])
           {
             // Skip aliases (e.g., update-for-install).
             //
@@ -846,7 +848,7 @@ namespace build2
       //
       scope& gs (*scope::global_);
       scope& rs (load_project (gs, d, d, false /* fwd */, false /* load */));
-      module& m (*rs.modules.lookup<module> (module::name));
+      module& m (*rs.lookup_module<module> (module::name));
 
       // Save all the global config.import.* variables.
       //
diff --git a/build2/config/utility.cxx b/build2/config/utility.cxx
index d2e8699..cc89d2f 100644
--- a/build2/config/utility.cxx
+++ b/build2/config/utility.cxx
@@ -141,7 +141,7 @@ namespace build2
       // The project might not be using the config module. But then how
       // could we be configuring it? Good question.
       //
-      if (module* m = r.modules.lookup<module> (module::name))
+      if (module* m = r.lookup_module<module> (module::name))
         m->save_variable (var, flags);
     }
 
@@ -151,7 +151,7 @@ namespace build2
       if (current_mif->id != configure_id)
         return;
 
-      if (module* m = r.modules.lookup<module> (module::name))
+      if (module* m = r.lookup_module<module> (module::name))
         m->save_module (name, prio);
     }