Update code to match changes in the recently committed DILLexer.

Changed method names, class names, arguments, etc. Also small cleanups
in header files (include-stmt ordering, namespaces, etc.).

Author: cmtice

lldb/include/lldb/ValueObject/DILAST.h

@@ -12,9 +12,7 @@
 #include "lldb/ValueObject/ValueObject.h"
 #include <string>
 
-namespace lldb_private {
-
-namespace dil {
+namespace lldb_private::dil {
 
 /// The various types DIL AST nodes (used by the DIL parser).
 enum class NodeKind {
@@ -98,8 +96,6 @@ class Visitor {
   Visit(const IdentifierNode *node) = 0;
 };
 
-} // namespace dil
-
-} // namespace lldb_private
+} // namespace lldb_private::dil
 
 #endif // LLDB_VALUEOBJECT_DILAST_H

lldb/include/lldb/ValueObject/DILEval.h

@@ -6,17 +6,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLDB_VALUEOBJECT_DILEVAL_H_
-#define LLDB_VALUEOBJECT_DILEVAL_H_
+#ifndef LLDB_VALUEOBJECT_DILEVAL_H
+#define LLDB_VALUEOBJECT_DILEVAL_H
 
 #include "lldb/ValueObject/DILAST.h"
 #include "lldb/ValueObject/DILParser.h"
 #include <memory>
 #include <vector>
 
-namespace lldb_private {
-
-namespace dil {
+namespace lldb_private::dil {
 
 /// Class used to store & manipulate information about identifiers.
 class IdentifierInfo {
@@ -89,8 +87,6 @@ class DILInterpreter : Visitor {
   std::shared_ptr<ExecutionContextScope> m_exe_ctx_scope;
 };
 
-} // namespace dil
-
-} // namespace lldb_private
+} // namespace lldb_private::dil
 
-#endif // LLDB_VALUEOBJECT_DILEVAL_H_
+#endif // LLDB_VALUEOBJECT_DILEVAL_H

lldb/include/lldb/ValueObject/DILParser.h

@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLDB_VALUEOBJECT_DILPARSER_H_
-#define LLDB_VALUEOBJECT_DILPARSER_H_
+#ifndef LLDB_VALUEOBJECT_DILPARSER_H
+#define LLDB_VALUEOBJECT_DILPARSER_H
 
 #include "lldb/Target/ExecutionContextScope.h"
 #include "lldb/Utility/Status.h"
@@ -19,9 +19,7 @@
 #include <tuple>
 #include <vector>
 
-namespace lldb_private {
-
-namespace dil {
+namespace lldb_private::dil {
 
 enum class ErrorCode : unsigned char {
   kOk = 0,
@@ -37,7 +35,7 @@ std::string FormatDiagnostics(llvm::StringRef input_expr,
 /// EBNF grammar for the parser is described in lldb/docs/dil-expr-lang.ebnf
 class DILParser {
 public:
-  explicit DILParser(llvm::StringRef dil_input_expr,
+  explicit DILParser(llvm::StringRef dil_input_expr, DILLexer lexer,
                      std::shared_ptr<ExecutionContextScope> exe_ctx_scope,
                      lldb::DynamicValueType use_dynamic, bool use_synthetic,
                      bool fragile_ivar, bool check_ptr_vs_member);
@@ -50,7 +48,7 @@ class DILParser {
 
   lldb::DynamicValueType UseDynamic() { return m_use_dynamic; }
 
-  using PtrOperator = std::tuple<dil::TokenKind, uint32_t>;
+  using PtrOperator = std::tuple<Token::Kind, uint32_t>;
 
 private:
   DILASTNodeUP ParseExpression();
@@ -67,9 +65,9 @@ class DILParser {
 
   void BailOut(Status error);
 
-  void Expect(dil::TokenKind kind);
+  void Expect(Token::Kind kind);
 
-  std::string TokenDescription(const DILToken &token);
+  std::string TokenDescription(const Token &token);
 
   void TentativeParsingRollback(uint32_t saved_idx) {
     m_error.Clear();
@@ -83,20 +81,19 @@ class DILParser {
   std::shared_ptr<ExecutionContextScope> m_ctx_scope;
 
   llvm::StringRef m_input_expr;
+
+  DILLexer m_dil_lexer;
   // The token lexer is stopped at (aka "current token").
-  DILToken m_dil_token;
+  Token m_dil_token;
   // Holds an error if it occures during parsing.
   Status m_error;
 
   lldb::DynamicValueType m_use_dynamic;
   bool m_use_synthetic;
   bool m_fragile_ivar;
   bool m_check_ptr_vs_member;
-  DILLexer m_dil_lexer;
 }; // class DILParser
 
-} // namespace dil
-
-} // namespace lldb_private
+} // namespace lldb_private::dil
 
-#endif // LLDB_VALUEOBJECT_DILPARSER_H_
+#endif // LLDB_VALUEOBJECT_DILPARSER_H

lldb/source/Target/StackFrame.cpp

@@ -32,6 +32,7 @@
 #include "lldb/Utility/Log.h"
 #include "lldb/Utility/RegisterValue.h"
 #include "lldb/ValueObject/DILEval.h"
+#include "lldb/ValueObject/DILLexer.h"
 #include "lldb/ValueObject/DILParser.h"
 #include "lldb/ValueObject/ValueObjectConstResult.h"
 #include "lldb/ValueObject/ValueObjectMemory.h"
@@ -535,8 +536,16 @@ ValueObjectSP StackFrame::DILGetValueForVariableExpressionPath(
   const bool no_synth_child =
       (options & eExpressionPathOptionsNoSyntheticChildren) != 0;
 
+  // Lex the expression.
+  auto lex_or_err = dil::DILLexer::Create(var_expr);
+  if (!lex_or_err) {
+    error = Status::FromError(lex_or_err.takeError());
+    return ValueObjectSP();
+  }
+  dil::DILLexer lexer = *lex_or_err;
+
   // Parse the expression.
-  dil::DILParser parser(var_expr, shared_from_this(), use_dynamic,
+  dil::DILParser parser(var_expr, lexer, shared_from_this(), use_dynamic,
                         !no_synth_child, !no_fragile_ivar, check_ptr_vs_member);
   auto tree_or_error = parser.Run();
   if (!tree_or_error) {

lldb/source/ValueObject/DILAST.cpp

@@ -8,9 +8,7 @@
 
 #include "lldb/ValueObject/DILAST.h"
 
-namespace lldb_private {
-
-namespace dil {
+namespace lldb_private::dil {
 
 llvm::Expected<lldb::ValueObjectSP> ErrorNode::Accept(Visitor *v) const {
   return v->Visit(this);
@@ -20,6 +18,4 @@ llvm::Expected<lldb::ValueObjectSP> IdentifierNode::Accept(Visitor *v) const {
   return v->Visit(this);
 }
 
-} // namespace dil
-
-} // namespace lldb_private
+} // namespace lldb_private::dil

lldb/source/ValueObject/DILEval.cpp

@@ -16,9 +16,7 @@
 #include "llvm/Support/FormatAdapters.h"
 #include <memory>
 
-namespace lldb_private {
-
-namespace dil {
+namespace lldb_private::dil {
 
 static lldb::ValueObjectSP
 LookupStaticIdentifier(lldb::TargetSP target_sp,
@@ -283,6 +281,4 @@ DILInterpreter::Visit(const IdentifierNode *node) {
   return val;
 }
 
-} // namespace dil
-
-} // namespace lldb_private
+} // namespace lldb_private::dil