2 files changed, 6 insertions, 4 deletions
diff --git a/libbuild2/test/script/lexer.cxx b/libbuild2/test/script/lexer.cxx
index b470d25..aec91fc 100644
--- a/libbuild2/test/script/lexer.cxx
+++ b/libbuild2/test/script/lexer.cxx
@@ -339,15 +339,17 @@ namespace build2
       }
 
       token lexer::
-      word (state st, bool sep)
+      word (const state& st, bool sep)
       {
-        lexer_mode m (st.mode);
+        lexer_mode m (st.mode); // Save.
 
         token r (base_lexer::word (st, sep));
 
         if (m == lexer_mode::variable)
         {
-          if (r.value.size () == 1 && digit (r.value[0])) // $N
+          if (r.type == type::word &&
+              r.value.size () == 1 &&
+              digit (r.value[0])) // $N
           {
             xchar c (peek ());
 
diff --git a/libbuild2/test/script/lexer.hxx b/libbuild2/test/script/lexer.hxx
index 993a9db..39b950a 100644
--- a/libbuild2/test/script/lexer.hxx
+++ b/libbuild2/test/script/lexer.hxx
@@ -77,7 +77,7 @@ namespace build2
         next_description ();
 
         virtual token
-        word (state, bool) override;
+        word (const state&, bool) override;
       };
     }
   }