aboutsummaryrefslogtreecommitdiff
path: root/build2/lexer.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'build2/lexer.cxx')
-rw-r--r--build2/lexer.cxx6
1 files changed, 3 insertions, 3 deletions
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);
}