Rename getters, refactor number lexing and remove '_'

Author: kuilpd

lldb/include/lldb/ValueObject/DILAST.h

@@ -118,8 +118,8 @@ class UnaryOpNode : public ASTNode {
 
   llvm::Expected<lldb::ValueObjectSP> Accept(Visitor *v) const override;
 
-  UnaryOpKind kind() const { return m_kind; }
-  ASTNode *operand() const { return m_operand.get(); }
+  UnaryOpKind GetKind() const { return m_kind; }
+  ASTNode *GetOperand() const { return m_operand.get(); }
 
   static bool classof(const ASTNode *node) {
     return node->GetKind() == NodeKind::eUnaryOpNode;
@@ -138,8 +138,8 @@ class ArraySubscriptNode : public ASTNode {
 
   llvm::Expected<lldb::ValueObjectSP> Accept(Visitor *v) const override;
 
-  ASTNode *lhs() const { return m_lhs.get(); }
-  ASTNode *rhs() const { return m_rhs.get(); }
+  ASTNode *GetLHS() const { return m_lhs.get(); }
+  ASTNode *GetRHS() const { return m_rhs.get(); }
 
   static bool classof(const ASTNode *node) {
     return node->GetKind() == NodeKind::eArraySubscriptNode;

lldb/source/ValueObject/DILEval.cpp

@@ -276,13 +276,13 @@ Interpreter::Visit(const IdentifierNode *node) {
 llvm::Expected<lldb::ValueObjectSP>
 Interpreter::Visit(const UnaryOpNode *node) {
   Status error;
-  auto rhs_or_err = Evaluate(node->operand());
+  auto rhs_or_err = Evaluate(node->GetOperand());
   if (!rhs_or_err)
     return rhs_or_err;
 
   lldb::ValueObjectSP rhs = *rhs_or_err;
 
-  switch (node->kind()) {
+  switch (node->GetKind()) {
   case UnaryOpKind::Deref: {
     lldb::ValueObjectSP dynamic_rhs = rhs->GetDynamicValue(m_default_dynamic);
     if (dynamic_rhs)
@@ -313,12 +313,12 @@ Interpreter::Visit(const UnaryOpNode *node) {
 
 llvm::Expected<lldb::ValueObjectSP>
 Interpreter::Visit(const ArraySubscriptNode *node) {
-  auto lhs_or_err = Evaluate(node->lhs());
+  auto lhs_or_err = Evaluate(node->GetLHS());
   if (!lhs_or_err) {
     return lhs_or_err;
   }
   lldb::ValueObjectSP base = *lhs_or_err;
-  auto rhs_or_err = Evaluate(node->rhs());
+  auto rhs_or_err = Evaluate(node->GetRHS());
   if (!rhs_or_err) {
     return rhs_or_err;
   }

lldb/source/ValueObject/DILLexer.cpp

@@ -64,25 +64,14 @@ static std::optional<llvm::StringRef> IsWord(llvm::StringRef expr,
   return candidate;
 }
 
-static void ConsumeNumberBody(char &prev_ch, llvm::StringRef::iterator &cur_pos,
-                              llvm::StringRef expr) {
-  while (cur_pos != expr.end() &&
-         (IsDigit(*cur_pos) || IsLetter(*cur_pos) || *cur_pos == '_')) {
-    prev_ch = *cur_pos;
-    cur_pos++;
-  }
-}
+static bool IsNumberBodyChar(char ch) { return IsDigit(ch) || IsLetter(ch); }
 
 static std::optional<llvm::StringRef> IsNumber(llvm::StringRef expr,
                                                llvm::StringRef &remainder) {
-  llvm::StringRef::iterator cur_pos = remainder.begin();
-  llvm::StringRef::iterator start = cur_pos;
-  char prev_ch = 0;
-  if (IsDigit(*start)) {
-    ConsumeNumberBody(prev_ch, cur_pos, expr);
-    llvm::StringRef number = expr.substr(start - expr.begin(), cur_pos - start);
-    if (remainder.consume_front(number))
-      return number;
+  if (IsDigit(remainder[0])) {
+    llvm::StringRef number = remainder.take_while(IsNumberBodyChar);
+    remainder = remainder.drop_front(number.size());
+    return number;
   }
   return std::nullopt;
 }

lldb/unittests/ValueObject/DILLexerTests.cpp

@@ -157,8 +157,7 @@ TEST(DILLexerTests, IdentifiersTest) {
 
 TEST(DILLexerTests, NumbersTest) {
   // These strings should lex into number tokens.
-  std::vector<std::string> valid_numbers = {"123", "0x123", "0123", "0b101",
-                                            "1_000"};
+  std::vector<std::string> valid_numbers = {"123", "0x123", "0123", "0b101"};
 
   // The lexer can lex these strings, but they should not be numbers.
   std::vector<std::string> invalid_numbers = {"", "x123", "b123"};