1 files changed, 31 insertions, 34 deletions
diff --git a/include/lldb/Breakpoint/BreakpointIDList.h b/include/lldb/Breakpoint/BreakpointIDList.h
index c42787066617..34cfbfe3268d 100644
--- a/include/lldb/Breakpoint/BreakpointIDList.h
+++ b/include/lldb/Breakpoint/BreakpointIDList.h
@@ -12,13 +12,14 @@
 
 // C Includes
 // C++ Includes
+#include <utility>
 #include <vector>
 
 // Other libraries and framework includes
 // Project includes
 
-#include "lldb/lldb-private.h"
 #include "lldb/Breakpoint/BreakpointID.h"
+#include "lldb/lldb-private.h"
 
 namespace lldb_private {
 
@@ -26,57 +27,53 @@ namespace lldb_private {
 // class BreakpointIDList
 //----------------------------------------------------------------------
 
-
-class BreakpointIDList
-{
+class BreakpointIDList {
 public:
-    typedef std::vector<BreakpointID> BreakpointIDArray;
+  // TODO: Convert this class to StringRef.
+  typedef std::vector<BreakpointID> BreakpointIDArray;
 
-    BreakpointIDList ();
+  BreakpointIDList();
 
-    virtual
-    ~BreakpointIDList ();
+  virtual ~BreakpointIDList();
 
-    size_t
-    GetSize();
+  size_t GetSize() const;
 
-    BreakpointID &
-    GetBreakpointIDAtIndex (size_t index);
+  const BreakpointID &GetBreakpointIDAtIndex(size_t index) const;
 
-    bool
-    RemoveBreakpointIDAtIndex (size_t index);
+  bool RemoveBreakpointIDAtIndex(size_t index);
 
-    void
-    Clear();
+  void Clear();
 
-    bool
-    AddBreakpointID (BreakpointID bp_id);
+  bool AddBreakpointID(BreakpointID bp_id);
 
-    bool
-    AddBreakpointID (const char *bp_id);
+  bool AddBreakpointID(const char *bp_id);
 
-    bool
-    FindBreakpointID (BreakpointID &bp_id, size_t *position);
+  // TODO: This should take a const BreakpointID.
+  bool FindBreakpointID(BreakpointID &bp_id, size_t *position) const;
 
-    bool
-    FindBreakpointID (const char *bp_id, size_t *position);
+  bool FindBreakpointID(const char *bp_id, size_t *position) const;
 
-    void
-    InsertStringArray (const char **string_array, size_t array_size, CommandReturnObject &result);
+  void InsertStringArray(const char **string_array, size_t array_size,
+                         CommandReturnObject &result);
 
-    static bool
-    StringContainsIDRangeExpression (const char *in_string, size_t *range_start_len, size_t *range_end_pos);
+  // Returns a pair consisting of the beginning and end of a breakpoint
+  // ID range expression.  If the input string is not a valid specification,
+  // returns an empty pair.
+  static std::pair<llvm::StringRef, llvm::StringRef>
+  SplitIDRangeExpression(llvm::StringRef in_string);
 
-    static void
-    FindAndReplaceIDRanges (Args &old_args, Target *target, bool allow_locations, CommandReturnObject &result, Args &new_args);
+  static void FindAndReplaceIDRanges(Args &old_args, Target *target,
+                                     bool allow_locations,
+                                     CommandReturnObject &result,
+                                     Args &new_args);
 
 private:
-    BreakpointIDArray m_breakpoint_ids;
-    BreakpointID m_invalid_id;
+  BreakpointIDArray m_breakpoint_ids;
+  BreakpointID m_invalid_id;
 
-    DISALLOW_COPY_AND_ASSIGN(BreakpointIDList);
+  DISALLOW_COPY_AND_ASSIGN(BreakpointIDList);
 };
 
 } // namespace lldb_private
 
-#endif  // liblldb_BreakpointIDList_h_
+#endif // liblldb_BreakpointIDList_h_