From b808c255b6a9ddba085bf5646e7d20ec344f2e2d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 28 Apr 2020 08:48:53 +0200
Subject: Initial support for ad hoc recipes (still work in progress)

---
 libbuild2/cc/compile-rule.cxx | 14 +++++++-------
 libbuild2/cc/init.cxx         |  6 +++---
 libbuild2/cc/lexer.cxx        | 13 +++++--------
 libbuild2/cc/link-rule.cxx    | 24 +++++-------------------
 4 files changed, 20 insertions(+), 37 deletions(-)

(limited to 'libbuild2/cc')

diff --git a/libbuild2/cc/compile-rule.cxx b/libbuild2/cc/compile-rule.cxx
index 8b082cc..6b9104f 100644
--- a/libbuild2/cc/compile-rule.cxx
+++ b/libbuild2/cc/compile-rule.cxx
@@ -5247,6 +5247,8 @@ namespace build2
     dir_path compile_rule::
     find_modules_sidebuild (const scope& rs) const
     {
+      context& ctx (rs.ctx);
+
       // First figure out where we are going to build. We want to avoid
       // multiple sidebuilds so the outermost scope that has loaded the
       // cc.config module and that is within our amalgmantion seems like a
@@ -5284,18 +5286,18 @@ namespace build2
                    modules_sidebuild_dir /=
                    x);
 
-      const scope* ps (&rs.ctx.scopes.find (pd));
+      const scope* ps (&ctx.scopes.find (pd));
 
       if (ps->out_path () != pd)
       {
         // Switch the phase to load then create and load the subproject.
         //
-        phase_switch phs (rs.ctx, run_phase::load);
+        phase_switch phs (ctx, run_phase::load);
 
         // Re-test again now that we are in exclusive phase (another thread
         // could have already created and loaded the subproject).
         //
-        ps = &rs.ctx.scopes.find (pd);
+        ps = &ctx.scopes.find (pd);
 
         if (ps->out_path () != pd)
         {
@@ -5322,15 +5324,13 @@ namespace build2
               {string (x) + '.'},             /* root_modules */
               "",                             /* root_post */
               nullopt,                        /* config_module */
+              nullopt,                        /* config_file */
               false,                          /* buildfile */
               "the cc module",
               2);                             /* verbosity */
           }
 
-          ps = &load_project (as->rw () /* lock */,
-                              pd,
-                              pd,
-                              false /* forwarded */);
+          ps = &load_project (ctx, pd, pd, false /* forwarded */);
         }
       }
 
diff --git a/libbuild2/cc/init.cxx b/libbuild2/cc/init.cxx
index 2a0dbd2..07051c5 100644
--- a/libbuild2/cc/init.cxx
+++ b/libbuild2/cc/init.cxx
@@ -142,9 +142,9 @@ namespace build2
 
       // Register scope operation callback.
       //
-      // It feels natural to do clean up sidebuilds as a post operation but
-      // that prevents the (otherwise-empty) out root directory to be cleaned
-      // up (via the standard fsdir{} chain).
+      // It feels natural to clean up sidebuilds as a post operation but that
+      // prevents the (otherwise-empty) out root directory to be cleaned up
+      // (via the standard fsdir{} chain).
       //
       rs.operation_callbacks.emplace (
         perform_clean_id,
diff --git a/libbuild2/cc/lexer.cxx b/libbuild2/cc/lexer.cxx
index d57f5eb..d2be3d8 100644
--- a/libbuild2/cc/lexer.cxx
+++ b/libbuild2/cc/lexer.cxx
@@ -48,8 +48,8 @@ namespace build2
     auto lexer::
     peek (bool e) -> xchar
     {
-      if (unget_)
-        return ungetc_;
+      if (ungetn_ != 0)
+        return ungetb_[ungetn_ - 1];
 
       if (unpeek_)
         return unpeekc_;
@@ -98,11 +98,8 @@ namespace build2
     inline auto lexer::
     get (bool e) -> xchar
     {
-      if (unget_)
-      {
-        unget_ = false;
-        return ungetc_;
-      }
+      if (ungetn_ != 0)
+        return ungetb_[--ungetn_];
       else
       {
         xchar c (peek (e));
@@ -117,7 +114,7 @@ namespace build2
       // Increment the logical line similar to how base will increment the
       // physical (the column counts are the same).
       //
-      if (log_line_ && c == '\n' && !unget_)
+      if (log_line_ && c == '\n' && ungetn_ == 0)
         ++*log_line_;
 
       base::get (c);
diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx
index b11ee42..bc8eb8e 100644
--- a/libbuild2/cc/link-rule.cxx
+++ b/libbuild2/cc/link-rule.cxx
@@ -2145,22 +2145,8 @@ namespace build2
                   // 1 is resource ID, 24 is RT_MANIFEST. We also need to
                   // escape Windows path backslashes.
                   //
-                  os << "1 24 \"";
-
-                  const string& s (mf.string ());
-                  for (size_t i (0), j;; i = j + 1)
-                  {
-                    j = s.find ('\\', i);
-                    os.write (s.c_str () + i,
-                              (j == string::npos ? s.size () : j) - i);
-
-                    if (j == string::npos)
-                      break;
-
-                    os.write ("\\\\", 2);
-                  }
-
-                  os << "\"" << endl;
+                  os << "1 24 \"" << sanitize_strlit (mf.string ()) << '"'
+                     << endl;
 
                   os.close ();
                   rm.cancel ();
@@ -3035,14 +3021,14 @@ namespace build2
       auto_rmfile trm;
       string targ;
       {
-        // Calculate the would-be command line length similar to how process'
-        // implementation does it.
-        //
         auto quote = [s = string ()] (const char* a) mutable -> const char*
         {
           return process::quote_argument (a, s);
         };
 
+        // Calculate the would-be command line length similar to how process'
+        // implementation does it.
+        //
         size_t n (0);
         for (const char* a: args)
         {
-- 
cgit v1.1