From 7ebe4aa8d07e8845f1669e2d43fbe6071d3ee463 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 3 Nov 2016 17:52:18 +0200
Subject: Make newline token always separated from previous one

---
 build2/lexer.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'build2/lexer.cxx')

diff --git a/build2/lexer.cxx b/build2/lexer.cxx
index 38d33ae..0ce9770 100644
--- a/build2/lexer.cxx
+++ b/build2/lexer.cxx
@@ -107,7 +107,7 @@ namespace build2
     xchar c (get ());
     uint64_t ln (c.line), cn (c.column);
 
-    auto make_token = [sep, ln, cn] (type t)
+    auto make_token = [&sep, ln, cn] (type t)
     {
       return token (t, sep, ln, cn, token_printer);
     };
@@ -132,6 +132,7 @@ namespace build2
         if (m == lexer_mode::value)
           state_.pop ();
 
+        sep = true; // Treat newline as always separated.
         return make_token (type::newline);
       }
     case '{': return make_token (type::lcbrace);
-- 
cgit v1.1