From 4b1f902b33d0826ccb2f6d5a1ceb8db7bdd2defe Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 4 Nov 2016 08:46:35 +0200 Subject: Change token type 'name' to more general 'word' --- build2/context.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'build2/context.cxx') diff --git a/build2/context.cxx b/build2/context.cxx index 1527cc8..c783832 100644 --- a/build2/context.cxx +++ b/build2/context.cxx @@ -110,14 +110,14 @@ namespace build2 // lexer l (is, path (""), "\'\"\\$("); - // The first token should be a name, either the variable name or the + // The first token should be a word, either the variable name or the // scope qualification. // token t (l.next ()); token_type tt (l.next ().type); dir_path dir; - if (t.type == token_type::name && tt == token_type::colon) + if (t.type == token_type::word && tt == token_type::colon) { if (!path::traits::is_separator (t.value.back ())) fail << "expected directory (with trailing slash) instead of " @@ -136,7 +136,7 @@ namespace build2 // This should be the variable name followed by =, +=, or =+. // - if (t.type != token_type::name || t.value.empty () || + if (t.type != token_type::word || t.value.empty () || (tt != token_type::assign && tt != token_type::prepend && tt != token_type::append)) -- cgit v1.1