diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-04 08:46:35 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-11-04 09:26:22 +0200 |
commit | 4b1f902b33d0826ccb2f6d5a1ceb8db7bdd2defe (patch) | |
tree | 9f0fcddb0b6cad34965a7ca330c3cd8b033c195d /build2/lexer.cxx | |
parent | 08aba2ee7cf407c9c25233ebbf43d0310e0f1b5e (diff) |
Change token type 'name' to more general 'word'
Diffstat (limited to 'build2/lexer.cxx')
-rw-r--r-- | build2/lexer.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/build2/lexer.cxx b/build2/lexer.cxx index 148b7c2..b188396 100644 --- a/build2/lexer.cxx +++ b/build2/lexer.cxx @@ -66,7 +66,7 @@ namespace build2 // Fall through. case lexer_mode::variable: { - // These are handled in an ad hoc way in name(). + // These are handled in an ad hoc way in word(). break; } default: assert (false); // Unhandled custom mode. @@ -165,10 +165,10 @@ namespace build2 } } - // Otherwise it is a name. + // Otherwise it is a word. // unget (c); - return name (sep); + return word (sep); } token lexer:: @@ -239,10 +239,10 @@ namespace build2 } } - // Otherwise it is a name. + // Otherwise it is a word. // unget (c); - return name (sep); + return word (sep); } token lexer:: @@ -261,14 +261,14 @@ namespace build2 case '(': return token (type::lparen, false, ln, cn, token_printer); } - // Otherwise it is a name. + // Otherwise it is a word. // unget (c); - return name (false); + return word (false); } token lexer:: - name (bool sep) + word (bool sep) { lexer_mode m (state_.top ().mode); @@ -439,7 +439,7 @@ namespace build2 if (eos (c) && m == lexer_mode::double_quoted) fail (c) << "unterminated double-quoted sequence"; - // Expire variable mode at the end of the name. + // Expire variable mode at the end of the word. // if (m == lexer_mode::variable) state_.pop (); |