From 7efdbab3cd38b7e1693f0a4a85a9933adb50fb9d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 4 Nov 2016 08:17:01 +0200
Subject: Handle printing of extended tokens

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

(limited to 'build2/parser.cxx')

diff --git a/build2/parser.cxx b/build2/parser.cxx
index 0853c04..c7ede35 100644
--- a/build2/parser.cxx
+++ b/build2/parser.cxx
@@ -178,7 +178,7 @@ namespace build2
 
     enter_buildfile (p); // Needs scope_.
 
-    token t (type::eos, false, 0, 0);
+    token t;
     type tt;
     next (t, tt);
 
@@ -198,8 +198,8 @@ namespace build2
     target_ = nullptr;
     scope_ = &s;
 
+    token t;
     type tt;
-    token t (type::eos, false, 0, 0);
     variable (t, tt, var, kind);
     return t;
   }
@@ -212,8 +212,8 @@ namespace build2
     target_ = nullptr;
     scope_ = &s;
 
+    token t;
     type tt;
-    token t (type::eos, false, 0, 0);
     value rhs (variable_value (t, tt));
 
     value lhs;
@@ -805,7 +805,7 @@ namespace build2
         lexer* ol (lexer_);
         lexer_ = &l;
 
-        token t (type::eos, false, 0, 0);
+        token t;
         type tt;
         next (t, tt);
         clause (t, tt);
@@ -938,7 +938,7 @@ namespace build2
         target* odt (default_target_);
         default_target_ = nullptr;
 
-        token t (type::eos, false, 0, 0);
+        token t;
         type tt;
         next (t, tt);
         clause (t, tt);
@@ -2040,7 +2040,8 @@ namespace build2
             tt != type::lparen) || peeked ().separated))
       {
         tt = type::name;
-        t = token (move (concat), true, false, t.line, t.column);
+        t = token (
+          move (concat), true, false, t.line, t.column, token_printer);
         concat.clear ();
       }
       else if (!first)
@@ -2744,7 +2745,7 @@ namespace build2
     //
     mode (lexer_mode::value);
 
-    token t (type::eos, false, 0, 0);
+    token t;
     type tt;
     next (t, tt);
 
-- 
cgit v1.1