Lexer: ::readWord now skips leading whiteSpace

src/Lexer.cpp

@@ -1324,16 +1324,18 @@ bool Lexer::readWord (
 {
   std::string::size_type eos = text.length ();
 
+  // Skip initial whitespace.
+  while (cursor <= eos &&
+         Lexer::isWhitespace(text[cursor]))
+    ++cursor;
+
   word = "";
   int c;
   while ((c = text[cursor]))
   {
     // Unquoted word ends on white space.
     if (Lexer::isWhitespace (c))
-    {
-      ++cursor;
       break;
-    }
 
     // Unicode U+XXXX or \uXXXX codepoint.
     else if (eos - cursor >= 6 &&

test/lexer.t.cpp

@@ -37,7 +37,7 @@ Context context;
 ////////////////////////////////////////////////////////////////////////////////
 int main (int argc, char** argv)
 {
-  UnitTest t (1067);
+  UnitTest t (1069);
 
   std::vector <std::pair <std::string, Lexer::Type>> tokens;
   std::string token;
@@ -248,6 +248,11 @@ int main (int argc, char** argv)
   t.ok (Lexer::readWord (text, cursor, word),               "readWord \"one 'two' three\\ four\" --> true");
   t.is (word, "three four",                                 "  word '" + word + "'");
 
+  text = "one     ";
+  cursor = 0;
+  t.ok (Lexer::readWord (text, cursor, word),               "readWord \"one     \" --> true");
+  t.is (word, "one",                                        "  word '" + word + "'");
+
   // Test all Lexer types.
   #define NO {"",Lexer::Type::word}
   struct