From 4eacc5d063b2810c87510b7afad5d0be203540a3 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 10 Sep 2015 11:12:12 +0200
Subject: Fix bug in names() chunking mode

---
 build/parser.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'build')

diff --git a/build/parser.cxx b/build/parser.cxx
index 092ae3d..b804494 100644
--- a/build/parser.cxx
+++ b/build/parser.cxx
@@ -871,12 +871,12 @@ namespace build
         // current or next token is a pair separator, since we want the
         // "x = y" pair to be parsed as a single chunk.
         //
-        if (chunk &&
-            peeked ().separated &&
-            (tt != type::pair_separator && t.type != type::pair_separator))
-          break;
+        bool p (t.type == type::pair_separator); // Current token.
 
         next (t, tt);
+
+        if (chunk && t.separated && (tt != type::pair_separator && !p))
+          break;
       }
 
       // Name.
-- 
cgit v1.1