From f6e6cfc3b5c7c84dedddc95084c423608769d4b7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 26 Apr 2017 12:43:15 +0200
Subject: Fix bug in pair handling

---
 build2/parser | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

(limited to 'build2/parser')

diff --git a/build2/parser b/build2/parser
index 7ca9366..16b7782 100644
--- a/build2/parser
+++ b/build2/parser
@@ -395,7 +395,7 @@ namespace build2
       //
       if (peeked_)
       {
-        assert (peek_.mode == m && peek_.pair_separator == ps);
+        assert (peek_.mode == m);
         return peek_.token.type;
       }
 
@@ -436,18 +436,6 @@ namespace build2
       }
     }
 
-    char
-    pair_separator () const
-    {
-      if (replay_ != replay::play)
-        return lexer_->pair_separator ();
-      else
-      {
-        assert (replay_i_ != replay_data_.size ());
-        return replay_data_[replay_i_].pair_separator;
-      }
-    }
-
     void
     expire_mode ()
     {
@@ -552,8 +540,7 @@ namespace build2
     lexer_next ()
     {
       lexer_mode m (lexer_->mode ()); // Get it first since it may expire.
-      char ps (lexer_->pair_separator ());
-      return replay_token {lexer_->next (), path_, m, ps};
+      return replay_token {lexer_->next (), path_, m};
     }
 
     const replay_token&
-- 
cgit v1.1