Change token type 'name' to more general 'word'

1 files changed, 4 insertions, 4 deletions

diff --git a/build2/lexer b/build2/lexer
index c6a6f5b..c5c3857 100644
--- a/build2/lexer
+++ b/build2/lexer
@@ -24,12 +24,12 @@ namespace build2
   // eval mode is used in the evaluation context. Quoted are internal modes
   // and should not be set explicitly.
   //
-  // Note that the normal, value, and eval modes split names separated by the
+  // Note that the normal, value, and eval modes split words separated by the
   // pair character (to disable pairs one can pass '\0' as a pair character).
   //
   // The alternnative modes must be set manually. The value mode is
   // automatically reset after the end of the line. The variable mode is reset
-  // after the name token. And the eval mode is reset after the closing ')'.
+  // after the word token. And the eval mode is reset after the closing ')'.
   //
 
   // Extendable/inheritable enum-like class.
@@ -115,7 +115,7 @@ namespace build2
     next_quoted ();
 
     virtual token
-    name (bool separated);
+    word (bool separated);
 
     // Return true if we have seen any spaces. Skipped empty lines
     // don't count. In other words, we are only interested in spaces
@@ -168,7 +168,7 @@ namespace build2
       char sep_pair;
       bool sep_space; // Are whitespaces separators (see skip_spaces())?
 
-      // Name separator characters. For two-character sequence put the first
+      // Word separator characters. For two-character sequence put the first
       // one in sep_first and the second one in the corresponding position of
       // sep_second. If it's a single-character sequence, then put space in
       // sep_second. If there are multiple sequences that start with the same