From 08de44303033cc5ad966f4e75a7fa4a3cb06635f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 26 Aug 2019 10:02:18 +0200
Subject: Implement updating build system modules

---
 libbuild2/context.cxx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'libbuild2/context.cxx')

diff --git a/libbuild2/context.cxx b/libbuild2/context.cxx
index db46319..e35f308 100644
--- a/libbuild2/context.cxx
+++ b/libbuild2/context.cxx
@@ -54,7 +54,11 @@ namespace build2
   };
 
   context::
-  context (scheduler& s, const strings& cmd_vars, bool dr, bool kg)
+  context (scheduler& s,
+           bool dr,
+           bool kg,
+           const strings& cmd_vars,
+           optional<unique_ptr<context>> mc)
       : data_ (new data (*this)),
         sched (s),
         dry_run_option (dr),
@@ -67,7 +71,9 @@ namespace build2
         functions (data_->functions),
         global_scope (create_global_scope (data_->scopes)),
         global_target_types (data_->global_target_types),
-        global_override_cache (data_->global_override_cache)
+        global_override_cache (data_->global_override_cache),
+        module_context (mc ? mc->get () : nullptr),
+        module_context_storage (move (mc))
   {
     tracer trace ("context");
 
@@ -76,7 +82,7 @@ namespace build2
     scope_map& sm (data_->scopes);
     variable_pool& vp (data_->var_pool);
 
-    register_builtin_functions (functions);
+    insert_builtin_functions (functions);
 
     // Initialize the meta/operation tables. Note that the order should match
     // the id constants in <libbuild2/operation.hxx>.
-- 
cgit v1.1