From fa47916a51f530a4c728063f71b0e8d6da4dac0f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 16 Oct 2016 12:10:27 +0200
Subject: Add support for lexer name scanning customization

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

(limited to 'build2/lexer.cxx')

diff --git a/build2/lexer.cxx b/build2/lexer.cxx
index 8f09baf..148b7c2 100644
--- a/build2/lexer.cxx
+++ b/build2/lexer.cxx
@@ -346,7 +346,7 @@ namespace build2
       //
       else if (m == lexer_mode::variable)
       {
-        if (!alnum (c) &&  c != '_')
+        if (c != '_' && !(lexeme.empty () ? alpha (c) : alnum (c)))
         {
           if (c != '.')
             done = true;
@@ -357,7 +357,7 @@ namespace build2
             //
             get ();
             xchar p (peek ());
-            done = eos (p) || !(alnum (p) ||  p == '_');
+            done = eos (p) || !(alpha (p) ||  p == '_');
             unget (c);
           }
         }
@@ -444,7 +444,7 @@ namespace build2
     if (m == lexer_mode::variable)
       state_.pop ();
 
-    return token (move (lexeme), sep, quoted, ln, cn, token_printer);
+    return token (move (lexeme), sep, quoted, ln, cn);
 
   }
 
-- 
cgit v1.1