From ab6917b035a8431a13d85396ed15b75dabe44b36 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 24 Apr 2020 15:11:51 +0200
Subject: Don't switch projects when switching scopes during bootstrap

---
 libbuild2/parser.hxx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'libbuild2/parser.hxx')

diff --git a/libbuild2/parser.hxx b/libbuild2/parser.hxx
index b21336d..6552114 100644
--- a/libbuild2/parser.hxx
+++ b/libbuild2/parser.hxx
@@ -9,6 +9,7 @@
 #include <libbuild2/utility.hxx>
 
 #include <libbuild2/spec.hxx>
+#include <libbuild2/file.hxx>
 #include <libbuild2/lexer.hxx>
 #include <libbuild2/token.hxx>
 #include <libbuild2/variable.hxx>
@@ -21,14 +22,7 @@ namespace build2
   class LIBBUILD2_SYMEXPORT parser
   {
   public:
-    // The project's loading stage during which the parsing is performed.
-    //
-    enum class stage
-    {
-      boot,  // Parsing bootstrap.build (or bootstrap pre/post hooks).
-      root,  // Parsing root.build (or root pre/post hooks).
-      rest   // Parsing the rest (ordinary buildfiles, command line, etc).
-    };
+    using stage = load_stage;
 
     explicit
     parser (context& c, stage s = stage::rest)
-- 
cgit v1.1