From 93f38c7b1e4bf3c7bf14af6785146c81614cbac5 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 19 Oct 2016 11:54:25 +0200
Subject: Various minor buildfile lexer/parser changes

---
 build2/lexer | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'build2/lexer')

diff --git a/build2/lexer b/build2/lexer
index f7f7b82..abaf273 100644
--- a/build2/lexer
+++ b/build2/lexer
@@ -40,11 +40,13 @@ namespace build2
 
   // Extendable/inheritable enum-like class.
   //
-  struct lexer_mode
+  struct lexer_mode: lexer_mode_base
   {
+    using base_type = lexer_mode_base;
+
     enum
     {
-      normal,
+      normal = base_type::value_next,
       variable,
       value,
       eval,
@@ -54,11 +56,9 @@ namespace build2
       value_next
     };
 
-    using value_type = uint16_t;
-
-    lexer_mode (value_type v = normal): v_ (v) {}
-    operator value_type () const {return v_;}
-    value_type v_;
+    lexer_mode () = default;
+    lexer_mode (value_type v): base_type (v) {}
+    lexer_mode (base_type v): base_type (v) {}
   };
 
   class lexer: protected butl::char_scanner
-- 
cgit v1.1