Add OptionValueFormatEntityList

Author: JDevlieghere

lldb/include/lldb/Interpreter/OptionValue.h

@@ -51,7 +51,8 @@ class OptionValue {
     eTypeString,
     eTypeUInt64,
     eTypeUUID,
-    eTypeFormatEntity
+    eTypeFormatEntity,
+    eTypeFormatEntityList,
   };
 
   enum {
@@ -72,7 +73,7 @@ class OptionValue {
   virtual ~OptionValue() = default;
 
   OptionValue(const OptionValue &other);
-  
+
   OptionValue& operator=(const OptionValue &other);
 
   // Subclasses should override these functions
@@ -249,6 +250,9 @@ class OptionValue {
   OptionValueFormatEntity *GetAsFormatEntity();
   const OptionValueFormatEntity *GetAsFormatEntity() const;
 
+  OptionValueFormatEntityList *GetAsFormatEntityList();
+  const OptionValueFormatEntityList *GetAsFormatEntityList() const;
+
   bool AppendFileSpecValue(FileSpec file_spec);
 
   bool OptionWasSet() const { return m_value_was_set; }
@@ -286,6 +290,8 @@ class OptionValue {
       return GetFileSpecValue();
     if constexpr (std::is_same_v<T, FileSpecList>)
       return GetFileSpecListValue();
+    if constexpr (std::is_same_v<T, std::vector<FormatEntity::Entry>>)
+      return GetFormatEntityList();
     if constexpr (std::is_same_v<T, lldb::LanguageType>)
       return GetLanguageValue();
     if constexpr (std::is_same_v<T, llvm::StringRef>)
@@ -387,8 +393,9 @@ class OptionValue {
   bool SetUUIDValue(const UUID &uuid);
 
   const FormatEntity::Entry *GetFormatEntity() const;
+  std::vector<FormatEntity::Entry> GetFormatEntityList() const;
   const RegularExpression *GetRegexValue() const;
-  
+
   mutable std::mutex m_mutex;
 };
 

lldb/include/lldb/Interpreter/OptionValueFormatEntityList.h

@@ -0,0 +1,62 @@
+//===-- OptionValueFormatEntityList.h --------------------------------*-
+// C++-*-===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_INTERPRETER_OPTIONVALUEFORMATENTITYLIST_H
+#define LLDB_INTERPRETER_OPTIONVALUEFORMATENTITYLIST_H
+
+#include "lldb/Core/FormatEntity.h"
+#include "lldb/Interpreter/OptionValue.h"
+
+namespace lldb_private {
+
+class OptionValueFormatEntityList
+    : public Cloneable<OptionValueFormatEntityList, OptionValue> {
+public:
+  OptionValueFormatEntityList();
+
+  OptionValueFormatEntityList(const OptionValueFormatEntityList &other)
+      : Cloneable(other), m_current_entries(other.m_current_entries),
+        m_current_formats(other.m_current_formats) {}
+
+  ~OptionValueFormatEntityList() override = default;
+
+  // Virtual subclass pure virtual overrides
+
+  OptionValue::Type GetType() const override { return eTypeFormatEntityList; }
+
+  void DumpValue(const ExecutionContext *exe_ctx, Stream &strm,
+                 uint32_t dump_mask) override;
+
+  Status
+  SetValueFromString(llvm::StringRef value,
+                     VarSetOperationType op = eVarSetOperationAssign) override;
+
+  void Clear() override;
+
+  std::vector<FormatEntity::Entry> GetCurrentValue() const {
+    std::lock_guard<std::recursive_mutex> lock(m_mutex);
+    return m_current_entries;
+  }
+
+protected:
+  llvm::Error Append(llvm::StringRef str);
+  llvm::Error Insert(size_t idx, llvm::StringRef str);
+  llvm::Error Replace(size_t idx, llvm::StringRef str);
+  llvm::Error Remove(size_t idx);
+
+  lldb::OptionValueSP Clone() const override;
+
+  std::vector<FormatEntity::Entry> m_current_entries;
+  std::vector<std::string> m_current_formats;
+  mutable std::recursive_mutex m_mutex;
+};
+
+} // namespace lldb_private
+
+#endif // LLDB_INTERPRETER_OPTIONVALUEFORMATENTITYLIST_H

lldb/include/lldb/Interpreter/OptionValues.h

@@ -22,6 +22,7 @@
 #include "lldb/Interpreter/OptionValueFileSpecList.h"
 #include "lldb/Interpreter/OptionValueFormat.h"
 #include "lldb/Interpreter/OptionValueFormatEntity.h"
+#include "lldb/Interpreter/OptionValueFormatEntityList.h"
 #include "lldb/Interpreter/OptionValueLanguage.h"
 #include "lldb/Interpreter/OptionValuePathMappings.h"
 #include "lldb/Interpreter/OptionValueProperties.h"

lldb/include/lldb/lldb-forward.h

@@ -150,6 +150,7 @@ class OptionValueFileSpec;
 class OptionValueFileSpecList;
 class OptionValueFormat;
 class OptionValueFormatEntity;
+class OptionValueFormatEntityList;
 class OptionValueLanguage;
 class OptionValuePathMappings;
 class OptionValueProperties;

lldb/source/Interpreter/CMakeLists.txt

@@ -41,6 +41,7 @@ add_lldb_library(lldbInterpreter NO_PLUGIN_DEPENDENCIES
   OptionValueFileSpecList.cpp
   OptionValueFormat.cpp
   OptionValueFormatEntity.cpp
+  OptionValueFormatEntityList.cpp
   OptionValueLanguage.cpp
   OptionValuePathMappings.cpp
   OptionValueProperties.cpp

lldb/source/Interpreter/OptionValue.cpp

@@ -184,6 +184,18 @@ const OptionValueFormatEntity *OptionValue::GetAsFormatEntity() const {
   return nullptr;
 }
 
+OptionValueFormatEntityList *OptionValue::GetAsFormatEntityList() {
+  if (GetType() == OptionValue::eTypeFormatEntityList)
+    return static_cast<OptionValueFormatEntityList *>(this);
+  return nullptr;
+}
+
+const OptionValueFormatEntityList *OptionValue::GetAsFormatEntityList() const {
+  if (GetType() == OptionValue::eTypeFormatEntityList)
+    return static_cast<const OptionValueFormatEntityList *>(this);
+  return nullptr;
+}
+
 OptionValuePathMappings *OptionValue::GetAsPathMappings() {
   if (GetType() == OptionValue::eTypePathMap)
     return static_cast<OptionValuePathMappings *>(this);
@@ -380,6 +392,13 @@ bool OptionValue::SetLanguageValue(lldb::LanguageType new_language) {
   return false;
 }
 
+std::vector<FormatEntity::Entry> OptionValue::GetFormatEntityList() const {
+  std::lock_guard<std::mutex> lock(m_mutex);
+  if (const OptionValueFormatEntityList *option_value = GetAsFormatEntityList())
+    return option_value->GetCurrentValue();
+  return {};
+}
+
 const FormatEntity::Entry *OptionValue::GetFormatEntity() const {
   std::lock_guard<std::mutex> lock(m_mutex);
   if (const OptionValueFormatEntity *option_value = GetAsFormatEntity())
@@ -502,6 +521,8 @@ const char *OptionValue::GetBuiltinTypeAsCString(Type t) {
     return "format";
   case eTypeFormatEntity:
     return "format-string";
+  case eTypeFormatEntityList:
+    return "format-string-list";
   case eTypeLanguage:
     return "language";
   case eTypePathMap:
@@ -546,6 +567,9 @@ lldb::OptionValueSP OptionValue::CreateValueFromCStringForTypeMask(
   case 1u << eTypeFormatEntity:
     value_sp = std::make_shared<OptionValueFormatEntity>(nullptr);
     break;
+  case 1u << eTypeFormatEntityList:
+    value_sp = std::make_shared<OptionValueFormatEntityList>();
+    break;
   case 1u << eTypeLanguage:
     value_sp = std::make_shared<OptionValueLanguage>(eLanguageTypeUnknown);
     break;