Move some functions from source/lldb.cpp to Utility.

Specifically, there were some functions for converting enums
to strings and a function for matching a string using a specific
matching algorithm.  This moves those functions to more appropriate
headers in lldb/Utility and updates references to include the
new headers.

llvm-svn: 232673

3 files changed, 162 insertions, 0 deletions

diff --git a/lldb/source/Utility/CMakeLists.txt b/lldb/source/Utility/CMakeLists.txt
index cafc649c829..293ef4a0a7a 100644
--- a/lldb/source/Utility/CMakeLists.txt
+++ b/lldb/source/Utility/CMakeLists.txt
@@ -3,10 +3,12 @@ set(LLVM_NO_RTTI 1)
 add_lldb_library(lldbUtility
   ARM_DWARF_Registers.cpp
   ARM64_DWARF_Registers.cpp
+  ConvertEnum.cpp
   JSON.cpp
   KQueue.cpp
   LLDBAssert.cpp
   ModuleCache.cpp
+  NameMatches.cpp
   PseudoTerminal.cpp
   Range.cpp
   RegisterNumber.cpp
diff --git a/lldb/source/Utility/ConvertEnum.cpp b/lldb/source/Utility/ConvertEnum.cpp
new file mode 100644
index 00000000000..e108f5e7542
--- /dev/null
+++ b/lldb/source/Utility/ConvertEnum.cpp
@@ -0,0 +1,110 @@
+//===-- ConvertEnum.cpp -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+#include "lldb/Utility/ConvertEnum.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+const char *
+lldb_private::GetVoteAsCString(Vote vote)
+{
+    switch (vote)
+    {
+        case eVoteNo:
+            return "no";
+        case eVoteNoOpinion:
+            return "no opinion";
+        case eVoteYes:
+            return "yes";
+    }
+    return "invalid";
+}
+
+const char *
+lldb_private::GetSectionTypeAsCString(lldb::SectionType sect_type)
+{
+    switch (sect_type)
+    {
+        case eSectionTypeInvalid:
+            return "invalid";
+        case eSectionTypeCode:
+            return "code";
+        case eSectionTypeContainer:
+            return "container";
+        case eSectionTypeData:
+            return "data";
+        case eSectionTypeDataCString:
+            return "data-cstr";
+        case eSectionTypeDataCStringPointers:
+            return "data-cstr-ptr";
+        case eSectionTypeDataSymbolAddress:
+            return "data-symbol-addr";
+        case eSectionTypeData4:
+            return "data-4-byte";
+        case eSectionTypeData8:
+            return "data-8-byte";
+        case eSectionTypeData16:
+            return "data-16-byte";
+        case eSectionTypeDataPointers:
+            return "data-ptrs";
+        case eSectionTypeDebug:
+            return "debug";
+        case eSectionTypeZeroFill:
+            return "zero-fill";
+        case eSectionTypeDataObjCMessageRefs:
+            return "objc-message-refs";
+        case eSectionTypeDataObjCCFStrings:
+            return "objc-cfstrings";
+        case eSectionTypeDWARFDebugAbbrev:
+            return "dwarf-abbrev";
+        case eSectionTypeDWARFDebugAranges:
+            return "dwarf-aranges";
+        case eSectionTypeDWARFDebugFrame:
+            return "dwarf-frame";
+        case eSectionTypeDWARFDebugInfo:
+            return "dwarf-info";
+        case eSectionTypeDWARFDebugLine:
+            return "dwarf-line";
+        case eSectionTypeDWARFDebugLoc:
+            return "dwarf-loc";
+        case eSectionTypeDWARFDebugMacInfo:
+            return "dwarf-macinfo";
+        case eSectionTypeDWARFDebugPubNames:
+            return "dwarf-pubnames";
+        case eSectionTypeDWARFDebugPubTypes:
+            return "dwarf-pubtypes";
+        case eSectionTypeDWARFDebugRanges:
+            return "dwarf-ranges";
+        case eSectionTypeDWARFDebugStr:
+            return "dwarf-str";
+        case eSectionTypeELFSymbolTable:
+            return "elf-symbol-table";
+        case eSectionTypeELFDynamicSymbols:
+            return "elf-dynamic-symbols";
+        case eSectionTypeELFRelocationEntries:
+            return "elf-relocation-entries";
+        case eSectionTypeELFDynamicLinkInfo:
+            return "elf-dynamic-link-info";
+        case eSectionTypeDWARFAppleNames:
+            return "apple-names";
+        case eSectionTypeDWARFAppleTypes:
+            return "apple-types";
+        case eSectionTypeDWARFAppleNamespaces:
+            return "apple-namespaces";
+        case eSectionTypeDWARFAppleObjC:
+            return "apple-objc";
+        case eSectionTypeEHFrame:
+            return "eh-frame";
+        case eSectionTypeCompactUnwind:
+            return "compact-unwind";
+        case eSectionTypeOther:
+            return "regular";
+    }
+    return "unknown";
+}
diff --git a/lldb/source/Utility/NameMatches.cpp b/lldb/source/Utility/NameMatches.cpp
new file mode 100644
index 00000000000..e10c47e4fd9
--- /dev/null
+++ b/lldb/source/Utility/NameMatches.cpp
@@ -0,0 +1,50 @@
+//===-- NameMatches.cpp -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+#include "lldb/Core/RegularExpression.h"
+#include "lldb/Utility/NameMatches.h"
+
+#include "llvm/ADT/StringRef.h"
+
+using namespace lldb_private;
+
+bool
+lldb_private::NameMatches(const char *name, NameMatchType match_type, const char *match)
+{
+    if (match_type == eNameMatchIgnore)
+        return true;
+
+    if (name == match)
+        return true;
+
+    if (name && match)
+    {
+        llvm::StringRef name_sref(name);
+        llvm::StringRef match_sref(match);
+        switch (match_type)
+        {
+            case eNameMatchIgnore: // This case cannot occur: tested before
+                return true;
+            case eNameMatchEquals:
+                return name_sref == match_sref;
+            case eNameMatchContains:
+                return name_sref.find(match_sref) != llvm::StringRef::npos;
+            case eNameMatchStartsWith:
+                return name_sref.startswith(match_sref);
+            case eNameMatchEndsWith:
+                return name_sref.endswith(match_sref);
+            case eNameMatchRegularExpression:
+            {
+                RegularExpression regex(match);
+                return regex.Execute(name);
+            }
+            break;
+        }
+    }
+    return false;
+}