[Lexer] Add missing keywords to lexer (#14)

Fixes #6

Author: kuilpd

lldb/include/lldb/ValueObject/DILLexer.h

@@ -35,9 +35,9 @@ enum class TokenKind {
   colon,
   coloncolon,
   comma,
+  eof,
   equal,
   equalequal,
-  eof,
   exclaim,
   exclaimequal,
   flt,
@@ -50,20 +50,28 @@ enum class TokenKind {
   invalid,
   kw_bool,
   kw_char,
+  kw_char16_t,
+  kw_char32_t,
+  kw_const,
   kw_double,
   kw_dynamic_cast,
   kw_false,
   kw_float,
   kw_int,
   kw_long,
+  kw_namespace,
   kw_nullptr,
   kw_reinterpret_cast,
   kw_short,
   kw_signed,
+  kw_sizeof,
   kw_static_cast,
   kw_this,
   kw_true,
   kw_unsigned,
+  kw_void,
+  kw_volatile,
+  kw_wchar_t,
   l_paren,
   l_square,
   less,
@@ -99,15 +107,6 @@ enum class TokenKind {
   wide_char_constant,
   wide_string_literal,
   word,
-  // type keywords -- Lexer does not recognize these yet.
-  kw_char16_t,
-  kw_char32_t,
-  kw_const,
-  kw_namespace,
-  kw_sizeof,
-  kw_void,
-  kw_volatile,
-  kw_wchar_t,
 };
 
 enum class TypeSpecifier {

lldb/source/ValueObject/DILLexer.cpp

@@ -21,21 +21,28 @@ namespace dil {
 const llvm::StringMap<dil::TokenKind> Keywords = {
     {"bool", dil::TokenKind::kw_bool},
     {"char", dil::TokenKind::kw_char},
+    {"char16_t", dil::TokenKind::kw_char16_t},
+    {"char32_t", dil::TokenKind::kw_char32_t},
+    {"const", dil::TokenKind::kw_const},
     {"double", dil::TokenKind::kw_double},
     {"dynamic_cast", dil::TokenKind::kw_dynamic_cast},
     {"false", dil::TokenKind::kw_false},
     {"float", dil::TokenKind::kw_float},
     {"int", dil::TokenKind::kw_int},
     {"long", dil::TokenKind::kw_long},
+    {"namespace", dil::TokenKind::kw_namespace},
     {"nullptr", dil::TokenKind::kw_nullptr},
     {"reinterpret_cast", dil::TokenKind::kw_reinterpret_cast},
     {"short", dil::TokenKind::kw_short},
     {"signed", dil::TokenKind::kw_signed},
+    {"sizeof", dil::TokenKind::kw_sizeof},
     {"static_cast", dil::TokenKind::kw_static_cast},
     {"this", dil::TokenKind::kw_this},
     {"true", dil::TokenKind::kw_true},
     {"unsigned", dil::TokenKind::kw_unsigned},
-};
+    {"void", dil::TokenKind::kw_void},
+    {"volatile", dil::TokenKind::kw_volatile},
+    {"wchar_t", dil::TokenKind::kw_wchar_t}};
 
 const std::string DILToken::getTokenName(dil::TokenKind kind) {
   std::string retval;