Initial support for ad hoc recipes (still work in progress)

1 files changed, 11 insertions, 1 deletions

diff --git a/libbuild2/context.cxx b/libbuild2/context.cxx
index 0be0046..a3455ea 100644
--- a/libbuild2/context.cxx
+++ b/libbuild2/context.cxx
@@ -340,8 +340,10 @@ namespace build2
       // And so the first token should be a word which can be either a
       // variable name (potentially with the directory qualification) or just
       // the directory, in which case it should be followed by another word
-      // (unqualified variable name).
+      // (unqualified variable name). To avoid treating any of the visibility
+      // modifiers as special we use the cmdvar mode.
       //
+      l.mode (lexer_mode::cmdvar);
       token t (l.next ());
 
       optional<dir_path> dir;
@@ -892,6 +894,14 @@ namespace build2
   }
 
   phase_switch::
+  phase_switch (phase_unlock&& u, phase_lock&& l)
+      : old_phase (u.l->phase), new_phase (l.phase)
+  {
+    phase_lock_instance = u.l; // Disarms phase_lock
+    u.l = nullptr;             // Disarms phase_unlock
+  }
+
+  phase_switch::
   ~phase_switch () noexcept (false)
   {
     phase_lock* pl (phase_lock_instance);