From 28f8338ded34f160e0083da9be4679bc778be7ca Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 25 Nov 2016 11:18:34 +0200
Subject: Distinguish token quoting type and completeness

---
 build2/parser.cxx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'build2/parser.cxx')

diff --git a/build2/parser.cxx b/build2/parser.cxx
index 5f9850d..c2737cb 100644
--- a/build2/parser.cxx
+++ b/build2/parser.cxx
@@ -2154,7 +2154,10 @@ namespace build2
             tt != type::lparen) || peeked ().separated))
       {
         tt = type::word;
-        t = token (move (concat_str), true, false, t.line, t.column);
+        t = token (move (concat_str),
+                   true,
+                   quote_type::unquoted, false,
+                   t.line, t.column);
         concat = false;
       }
       else if (!first)
@@ -2792,7 +2795,7 @@ namespace build2
     //
     // See tests/keyword.
     //
-    if (!t.quoted)
+    if (t.qtype == quote_type::unquoted)
     {
       // We cannot peek at the whole token here since it might have to be
       // lexed in a different mode. So peek at its first character.
-- 
cgit v1.1