From 11047ff67adb53ccd72bb9ef06dc8bae9e52e4b3 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Fri, 5 Jun 2020 22:12:09 +0300
Subject: Various minor fixes

---
 libbuild2/rule.cxx          | 4 ++--
 libbuild2/script/script.cxx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'libbuild2')

diff --git a/libbuild2/rule.cxx b/libbuild2/rule.cxx
index f534ff9..ea7186c 100644
--- a/libbuild2/rule.cxx
+++ b/libbuild2/rule.cxx
@@ -841,8 +841,8 @@ namespace build2
           string s;
           try
           {
-            s = convert<string> (names (move_iterator (ns.begin () + 1),
-                                        move_iterator (ns.end ())));
+            s = convert<string> (names (make_move_iterator (ns.begin () + 1),
+                                        make_move_iterator (ns.end ())));
           }
           catch (const invalid_argument& e)
           {
diff --git a/libbuild2/script/script.cxx b/libbuild2/script/script.cxx
index eb63e53..c9b3a5e 100644
--- a/libbuild2/script/script.cxx
+++ b/libbuild2/script/script.cxx
@@ -163,7 +163,7 @@ namespace build2
         //
         if (t.type == token_type::word &&
             qtok != '\''               &&
-            prev_tt != token_type::dollar)
+            (!prev_tt || *prev_tt != token_type::dollar))
         {
           for (char c: t.value)
           {
-- 
cgit v1.1