Move roots and bases to appropriate scopes

1 files changed, 5 insertions, 5 deletions

diff --git a/build/scope b/build/scope
index 2746ff8..b4f492d 100644
--- a/build/scope
+++ b/build/scope
@@ -26,18 +26,18 @@ namespace build
     // Variable lookup.
     //
   public:
-    value*
-    operator[] (const variable&);
+    value_proxy
+    operator[] (const std::string&);
 
-    value*
-    operator[] (const std::string& name);
+    value_proxy
+    operator[] (const variable&);
 
   private:
     friend class scope_map;
 
     typedef path_map<scope>::const_iterator iterator;
 
-    scope () = default;
+    scope (): variables (*this) {}
 
     void
     init (const iterator& i, scope* p) {i_ = i; parent_ = p;}